diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 1 | ||||
| -rw-r--r-- | testsuite/tests/hsc2hs/Makefile | 22 |
2 files changed, 13 insertions, 10 deletions
diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index 8870a35f80..e4631f13ff 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -30,6 +30,7 @@ main = do getGhcFieldProgWithDefault fields "CLANG" "LLVM clang command" "clang" getGhcFieldProgWithDefault fields "LLC" "LLVM llc command" "llc" getGhcFieldProgWithDefault fields "TEST_CC" "C compiler command" "gcc" + getGhcFieldProgWithDefault fields "TEST_CC_OPTS" "C compiler flags" "" let pkgdb_flag = case lookup "Project version" fields of Just v diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile index 9291e4bc74..d0b2d249c3 100644 --- a/testsuite/tests/hsc2hs/Makefile +++ b/testsuite/tests/hsc2hs/Makefile @@ -2,53 +2,55 @@ TOP=../.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/test.mk +HSC2HS_OPTS = --cc="$(TEST_CC)" $(addprefix --cflag=,$(TEST_CC_OPTS)) --ld=$(TEST_CC) $(addprefix --lflag=,$(TEST_CC_OPTS)) + .PHONY: hsc2hs001 hsc2hs001: - '$(HSC2HS)' $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs .PHONY: hsc2hs002 hsc2hs002: - '$(HSC2HS)' $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs .PHONY: hsc2hs003 hsc2hs003: - '$(HSC2HS)' $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@ ./$@ .PHONY: hsc2hs004 hsc2hs004: - '$(HSC2HS)' --cross-compile $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) --cross-compile $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@ ./$@ .PHONY: T3837 T3837: - LANG=C '$(HSC2HS)' $@.hsc + LANG=C '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs .PHONY: T4340 T4340: - '$(HSC2HS)' $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@ ./$@ .PHONY: T10272 T10272: - '$(HSC2HS)' --cross-compile $@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) --cross-compile $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@ ./$@ .PHONY: T11004 T11004: - LANG=C '$(HSC2HS)' $@.hsc + LANG=C '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc '$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs .PHONY: T12504 T12504: - '$(HSC2HS)' T12504/path/to/$@.hsc + '$(HSC2HS)' $(HSC2HS_OPTS) T12504/path/to/$@.hsc ifeq "$(WINDOWS)" "YES" grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs else @@ -57,5 +59,5 @@ endif .PHONY: T15758 T15758: - '$(HSC2HS)' $@.hsc @T15758.response + '$(HSC2HS)' $(HSC2HS_OPTS) $@.hsc @T15758.response '$(TEST_HC)' $(TEST_HC_OPTS) -c $@.a.hs |