diff options
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | libraries/base/base.cabal | 3 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 46c79e1d8d0ed76b20e8494b697f3057b64aafd +Subproject 357d49d826004c022f3b4871f16d753e1b932b5 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 43c7882253..e6f6420416 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -338,6 +338,9 @@ Library cbits/primFloat.c cbits/sysconf.c + cmm-sources: + cbits/CastFloatWord.cmm + include-dirs: include includes: HsBase.h diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 2ba912a30f..9d0ffcff9a 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -406,8 +406,9 @@ generate directory distdir config_args variablePrefix ++ "_INSTALL_INCLUDES = " ++ unwords (installIncludes bi), variablePrefix ++ "_EXTRA_LIBRARIES = " ++ unwords (extraLibs bi), variablePrefix ++ "_EXTRA_LIBDIRS = " ++ unwords (extraLibDirs bi), + variablePrefix ++ "_S_SRCS = " ++ unwords (asmSources bi), variablePrefix ++ "_C_SRCS = " ++ unwords (cSources bi), - variablePrefix ++ "_CMM_SRCS := $(addprefix cbits/,$(notdir $(wildcard " ++ directory ++ "/cbits/*.cmm)))", + variablePrefix ++ "_CMM_SRCS = " ++ unwords (cmmSources bi), variablePrefix ++ "_DATA_FILES = " ++ unwords (dataFiles pd), -- XXX This includes things it shouldn't, like: -- -odir dist-bootstrapping/build |