diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-07-07 14:25:44 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-07-25 00:45:08 -0400 |
| commit | 459afeb592d5ff6d338184f5ef248758ecda57a4 (patch) | |
| tree | dc667acef485c06485bc53a5b4bde3f4595d53b5 /compiler | |
| parent | 7721b923d53fb9eb93f80bb93b4c3bd976c05b4c (diff) | |
| download | haskell-459afeb592d5ff6d338184f5ef248758ecda57a4.tar.gz | |
Fix build systems
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/ghc.cabal.in | 5 | ||||
| -rw-r--r-- | compiler/ghc.mk | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index efa45c89e4..e37a32ce6a 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -257,6 +257,7 @@ Library GHC.Cmm.Ppr.Expr GHC.Data.Bitmap GHC.Platform + GHC.Platform.Constants GHC.Platform.Ways GHC.Platform.Profile GHC.Platform.Regs @@ -568,8 +569,8 @@ Library GHC.Cmm.Dataflow.Label reexported-modules: - GHC.Platform.ArchOS - GHC.Platform.Host + GHC.Platform.ArchOS + , GHC.Platform.Host Exposed-Modules: GHC.CmmToAsm diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 92a844c779..bd5fdde71f 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -47,9 +47,7 @@ $(foreach n,1 2 3, \ $(foreach n,1 2 3, \ $(eval compiler/stage$n/package-data.mk : compiler/stage$n/build/GHC/Settings/Config.hs) \ - $(eval compiler/stage$n/build/PlatformConstants.o : $(includes_GHCCONSTANTS_HASKELL_TYPE)) \ - $(eval compiler/stage$n/build/GHC/Driver/Session.o: $(includes_GHCCONSTANTS_HASKELL_EXPORTS)) \ - $(eval compiler/stage$n/build/GHC/Driver/Session.o: $(includes_GHCCONSTANTS_HASKELL_WRAPPERS)) \ + $(eval compiler/stage$n/build/GHC/Platform/Constants.o: compiler/stage$n/build/GHC/Platform/Constants.hs) \ ) endif @@ -95,6 +93,10 @@ compiler/stage$1/build/GHC/Settings/Config.hs : mk/config.mk mk/project.mk | $$$ @echo 'cStage :: String' >> $$@ @echo 'cStage = show ($1 :: Int)' >> $$@ @echo done. + +compiler/stage$1/build/GHC/Platform/Constants.hs : $$(includes_GHCCONSTANTS_HASKELL_TYPE) | $$$$(dir $$$$@)/. + $$(call removeFiles,$$@) + "$$(CP)" $$< $$@ endef $(eval $(call compilerConfig,0)) @@ -351,9 +353,6 @@ $(compiler_stage2_depfile_haskell) : $(includes_1_H_CONFIG) $(includes_1_H_PLATF $(compiler_stage3_depfile_haskell) : $(includes_2_H_CONFIG) $(includes_2_H_PLATFORM) COMPILER_INCLUDES_DEPS += $(includes_GHCCONSTANTS) -COMPILER_INCLUDES_DEPS += $(includes_GHCCONSTANTS_HASKELL_TYPE) -COMPILER_INCLUDES_DEPS += $(includes_GHCCONSTANTS_HASKELL_WRAPPERS) -COMPILER_INCLUDES_DEPS += $(includes_GHCCONSTANTS_HASKELL_EXPORTS) COMPILER_INCLUDES_DEPS += $(includes_DERIVEDCONSTANTS) $(compiler_stage1_depfile_haskell) : $(COMPILER_INCLUDES_DEPS) $(PRIMOP_BITS_STAGE1) |