diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-14 16:56:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-15 00:49:24 +0000 |
| commit | 6215d4c858c1502c6c1929521fdd7fd00f16bb2d (patch) | |
| tree | 4137b2064914fe23306a68219127dd8347075b86 /testsuite/mk | |
| parent | f3da8ce8a034f1c0e3dc9aa30faf721fea2ec70b (diff) | |
| download | haskell-6215d4c858c1502c6c1929521fdd7fd00f16bb2d.tar.gz | |
Fix tests for dynamic ghc
Diffstat (limited to 'testsuite/mk')
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 10 | ||||
| -rw-r--r-- | testsuite/mk/ghc-config.hs | 1 | ||||
| -rw-r--r-- | testsuite/mk/test.mk | 8 |
3 files changed, 19 insertions, 0 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index f9ed52ee0f..e5bf164391 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -164,6 +164,16 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" "" include $(ghc-config-mk) endif +ifeq "$(GhcDynamic)" "YES" +ghcThWayFlags = -dynamic +ghciWayFlags = -dynamic +ghcPluginWayFlags = -dynamic +else +ghcThWayFlags = -static +ghciWayFlags = -static +ghcPluginWayFlags = -static +endif + # ----------------------------------------------------------------------------- ifeq "$(HostOS)" "mingw32" diff --git a/testsuite/mk/ghc-config.hs b/testsuite/mk/ghc-config.hs index 3145488904..2a229a7580 100644 --- a/testsuite/mk/ghc-config.hs +++ b/testsuite/mk/ghc-config.hs @@ -24,6 +24,7 @@ main = do getGhcFieldOrFail fields "GhcWithSMP" "Support SMP" getGhcFieldOrFail fields "GhcRTSWays" "RTS ways" getGhcFieldOrDefault fields "GhcDynamicByDefault" "Dynamic by default" "NO" + getGhcFieldOrDefault fields "GhcDynamic" "GHC Dynamic" "NO" getGhcFieldProgWithDefault fields "AR" "ar command" "ar" let pkgdb_flag = case lookup "Project version" fields of diff --git a/testsuite/mk/test.mk b/testsuite/mk/test.mk index e7604bdd7d..3ba6f74e9c 100644 --- a/testsuite/mk/test.mk +++ b/testsuite/mk/test.mk @@ -104,6 +104,14 @@ RUNTEST_OPTS += -e ghc_dynamic_by_default=False CABAL_MINIMAL_BUILD = --enable-library-vanilla --disable-shared endif +ifeq "$(GhcDynamic)" "YES" +RUNTEST_OPTS += -e ghc_dynamic=True +CABAL_PLUGIN_BUILD = --enable-shared --disable-library-vanilla +else +RUNTEST_OPTS += -e ghc_dynamic=False +CABAL_PLUGIN_BUILD = --enable-library-vanilla --disable-shared +endif + ifeq "$(GhcWithSMP)" "YES" RUNTEST_OPTS += -e ghc_with_smp=1 else |