diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.mk | 10 | ||||
| -rw-r--r-- | compiler/main/DynFlags.hs | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 07e185f0d6..f3b4fead5d 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -28,6 +28,16 @@ ifneq "$(BINDIST)" "YES" compiler/stage1/package-data.mk : compiler/stage1/build/Config.hs compiler/stage2/package-data.mk : compiler/stage2/build/Config.hs compiler/stage3/package-data.mk : compiler/stage3/build/Config.hs + +compiler/stage1/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_TYPE) +compiler/stage2/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_TYPE) +compiler/stage3/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_TYPE) +compiler/stage1/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_EXPORTS) +compiler/stage2/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_EXPORTS) +compiler/stage3/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_EXPORTS) +compiler/stage1/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) +compiler/stage2/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) +compiler/stage3/build/DynFlags.o: $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) endif compiler/stage%/build/Config.hs : mk/config.mk mk/project.mk | $$(dir $$@)/. diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 07ebd4013e..1bb39666c5 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1248,7 +1248,7 @@ defaultDynFlags mySettings = } defaultWays :: Settings -> [Way] -defaultWays settings = if pc_dYNAMIC_BY_DEFAULT (sPlatformConstants settings) +defaultWays settings = if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings) then [WayDyn] else [] @@ -2571,7 +2571,7 @@ defaultFlags settings ++ default_PIC platform - ++ (if pc_dYNAMIC_BY_DEFAULT (sPlatformConstants settings) + ++ (if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings) then wayGeneralFlags platform WayDyn else [Opt_Static]) |