Adds cmm-sources to base
authorMoritz Angermann <moritz.angermann@gmail.com>
Sat, 11 Nov 2017 15:55:51 +0000 (10:55 -0500)
committerBen Gamari <ben@smart-cactus.org>
Sat, 11 Nov 2017 16:34:25 +0000 (11:34 -0500)
Bumps Cabal submodule.

Reviewers: bgamari, hvr

Reviewed By: bgamari

Subscribers: rwbarton, thomie

Differential Revision: https://phabricator.haskell.org/D4176

libraries/Cabal
libraries/base/base.cabal
utils/ghc-cabal/Main.hs

index 46c79e1..357d49d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 46c79e1d8d0ed76b20e8494b697f3057b64aafd5
+Subproject commit 357d49d826004c022f3b4871f16d753e1b932b54
index 43c7882..e6f6420 100644 (file)
@@ -338,6 +338,9 @@ Library
         cbits/primFloat.c
         cbits/sysconf.c
 
+    cmm-sources:
+        cbits/CastFloatWord.cmm
+
     include-dirs: include
     includes:
         HsBase.h
index 2ba912a..9d0ffcf 100644 (file)
@@ -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