[commit: ghc] master: Revert "fix linker_unload test on Solaris/i386 platform" (8e400d2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e400d244272c9d41d9d918858acae4497c5f723/ghc

>---------------------------------------------------------------

commit 8e400d244272c9d41d9d918858acae4497c5f723
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Wed Aug 6 21:52:20 2014 +0200

    Revert "fix linker_unload test on Solaris/i386 platform"
    
    This reverts commit 65e5dbcd3971cb3ef5b9073096e5d063034b90c1.


>---------------------------------------------------------------

8e400d244272c9d41d9d918858acae4497c5f723
 testsuite/tests/rts/Makefile        | 4 +---
 testsuite/tests/rts/linker_unload.c | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
index 8833d45..180fe9b 100644
--- a/testsuite/tests/rts/Makefile
+++ b/testsuite/tests/rts/Makefile
@@ -108,9 +108,7 @@ BASE_DIR = $(shell $(LOCAL_GHC_PKG) field base library-dirs | sed 's/^.*: *//')
 BASE_LIB = $(shell $(LOCAL_GHC_PKG) field base hs-libraries | sed 's/^.*: *//')
 GHC_PRIM_DIR = $(shell $(LOCAL_GHC_PKG) field ghc-prim library-dirs | sed 's/^.*: *//')
 GHC_PRIM_LIB = $(shell $(LOCAL_GHC_PKG) field ghc-prim hs-libraries | sed 's/^.*: *//')
-# need to cut here in order to get rid of system gmp library directory installation when
-# ghc is configured with --with-gmp-libraries=<dir> parameter
-INTEGER_GMP_DIR = $(shell $(LOCAL_GHC_PKG) field integer-gmp library-dirs | sed 's/^.*: *//' | cut -d ' ' -f -1)
+INTEGER_GMP_DIR = $(shell $(LOCAL_GHC_PKG) field integer-gmp library-dirs | sed 's/^.*: *//')
 INTEGER_GMP_LIB = $(shell $(LOCAL_GHC_PKG) field integer-gmp hs-libraries | sed 's/^.*: *//')
 
 BASE        = $(BASE_DIR)/lib$(BASE_LIB).a
diff --git a/testsuite/tests/rts/linker_unload.c b/testsuite/tests/rts/linker_unload.c
index f1cc891..55870c3 100644
--- a/testsuite/tests/rts/linker_unload.c
+++ b/testsuite/tests/rts/linker_unload.c
@@ -1,4 +1,3 @@
-#include "ghcconfig.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "Rts.h"