diff options
| author | Karel Gardas <karel.gardas@centrum.cz> | 2014-08-06 21:52:20 +0200 |
|---|---|---|
| committer | Karel Gardas <karel.gardas@centrum.cz> | 2014-08-06 21:52:20 +0200 |
| commit | 8e400d244272c9d41d9d918858acae4497c5f723 (patch) | |
| tree | 1b1ac9d9dc7f94b3d556baf6bc9dec5e9ee60d2f /testsuite/tests/rts | |
| parent | c88559b3304cc5e142ab9c2655d48e570f81afeb (diff) | |
| download | haskell-8e400d244272c9d41d9d918858acae4497c5f723.tar.gz | |
Revert "fix linker_unload test on Solaris/i386 platform"
This reverts commit 65e5dbcd3971cb3ef5b9073096e5d063034b90c1.
Diffstat (limited to 'testsuite/tests/rts')
| -rw-r--r-- | testsuite/tests/rts/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/rts/linker_unload.c | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile index 8833d45743..180fe9b5ee 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 f1cc891df1..55870c348f 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" |