diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2011-12-13 12:47:22 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2011-12-13 13:12:24 +0000 |
| commit | 1f725a82331ccc1a38d82df31d1208bd6a0658c8 (patch) | |
| tree | 8b23b91335fe0ace669240fa23fcd47105044463 /testsuite | |
| parent | ce7325ceb268a9468c8f36e7b86a83b52ac62aaf (diff) | |
| download | haskell-1f725a82331ccc1a38d82df31d1208bd6a0658c8.tar.gz | |
Get the value of $(AR) from ghc --info
On Windows, 'ar' might not necessarily be on $PATH.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 5 | ||||
| -rw-r--r-- | testsuite/tests/ghci/linking/Makefile | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index 4eeb1aa251..d8c7c9e75e 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -138,6 +138,11 @@ endif $(eval $(call get-ghc-field,GhcRTSWays,RTS ways)) +$(eval $(call get-ghc-field,AR,ar command)) +ifeq "$(AR)" "" +AR = ar +endif + TOP_ABS := $(abspath $(TOP)) $(eval $(call canonicalise,TOP_ABS)) diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile index 0f5b1ed185..4791712eb7 100644 --- a/testsuite/tests/ghci/linking/Makefile +++ b/testsuite/tests/ghci/linking/Makefile @@ -12,7 +12,7 @@ ghcilink001 : $(RM) -rf dir001 mkdir dir001 "$(TEST_HC)" -c f.c -o dir001/foo.o - ar cqs dir001/libfoo.a dir001/foo.o + $(AR) cqs dir001/libfoo.a dir001/foo.o echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -Ldir001 -lfoo TestLink.hs # Test 2: ghci -Ldir -lfoo @@ -66,7 +66,7 @@ ghcilink004 : '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF004) register $(PKG004) -v0 # "$(TEST_HC)" -c f.c -o dir004/foo.o - ar cqs dir004/libfoo.a dir004/foo.o + $(AR) cqs dir004/libfoo.a dir004/foo.o echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-conf $(LOCAL_PKGCONF004) -package test TestLink.hs |