[commit: ghc] wip/angerman/llvmng: Use cmmSources (5b22f81)

[git at git.haskell.org]

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

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/5b22f8183e65cc61357ee93bf9fdfe47a569a8b1/ghc

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

commit 5b22f8183e65cc61357ee93bf9fdfe47a569a8b1
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Fri Nov 10 10:43:28 2017 +0800

    Use cmmSources


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

5b22f8183e65cc61357ee93bf9fdfe47a569a8b1
 libraries/Cabal         | 2 +-
 utils/ghc-cabal/Main.hs | 3 ++-
 2 files changed, 3 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/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