[commit: ghc] master: Adds cmm-sources to base (ba2ae2c)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ba2ae2c8729d5aef2aeb7fb32d6c0ea2a465ea25/ghc

>---------------------------------------------------------------

commit ba2ae2c8729d5aef2aeb7fb32d6c0ea2a465ea25
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sat Nov 11 10:55:51 2017 -0500

    Adds cmm-sources to base
    
    Bumps Cabal submodule.
    
    Reviewers: bgamari, hvr
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4176


>---------------------------------------------------------------

ba2ae2c8729d5aef2aeb7fb32d6c0ea2a465ea25
 libraries/Cabal           | 2 +-
 libraries/base/base.cabal | 3 +++
 utils/ghc-cabal/Main.hs   | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 46c79e1..357d49d 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 46c79e1d8d0ed76b20e8494b697f3057b64aafd5
+Subproject commit 357d49d826004c022f3b4871f16d753e1b932b54
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index 43c7882..e6f6420 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 2ba912a..9d0ffcf 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