merge up to ghc HEAD 16-Apr-2011

[ghc-hetmet.git] / utils / ghc-cabal / Main.hs

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 60f02e7..72a5010 100644 (file)
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -371,15 +371,15 @@ generate config_args distdir directory
                         ++ languageToFlags (compiler lbi) (defaultLanguage bi)
                         ++ extensionsToFlags (compiler lbi) (usedExtensions bi)
                         ++ programOverrideArgs ghcProg)),
-                variablePrefix ++ "_CC_OPTS = " ++ unwords (ccOptions bi),
-                variablePrefix ++ "_CPP_OPTS = " ++ unwords (cppOptions bi),
-                variablePrefix ++ "_LD_OPTS = " ++ unwords (ldOptions bi),
+                variablePrefix ++ "_CC_OPTS = "                        ++ unwords (ccOptions bi),
+                variablePrefix ++ "_CPP_OPTS = "                       ++ unwords (cppOptions bi),
+                variablePrefix ++ "_LD_OPTS = "                        ++ unwords (ldOptions bi),
                 variablePrefix ++ "_DEP_INCLUDE_DIRS_SINGLE_QUOTED = " ++ unwords wrappedIncludeDirs,
-                variablePrefix ++ "_DEP_CC_OPTS = "    ++ unwords (forDeps Installed.ccOptions),
-                variablePrefix ++ "_DEP_LIB_DIRS_SINGLE_QUOTED = "   ++ unwords wrappedLibraryDirs,
-                variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries),
-                variablePrefix ++ "_DEP_LD_OPTS = "    ++ unwords (forDeps Installed.ldOptions),
-                variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi),
+                variablePrefix ++ "_DEP_CC_OPTS = "                    ++ unwords (forDeps Installed.ccOptions),
+                variablePrefix ++ "_DEP_LIB_DIRS_SINGLE_QUOTED = "     ++ unwords wrappedLibraryDirs,
+                variablePrefix ++ "_DEP_EXTRA_LIBS = "                 ++ unwords (forDeps Installed.extraLibraries),
+                variablePrefix ++ "_DEP_LD_OPTS = "                    ++ unwords (forDeps Installed.ldOptions),
+                variablePrefix ++ "_BUILD_GHCI_LIB = "                 ++ boolToYesNo (withGHCiLib lbi),
                 "",
                 -- Sometimes we need to modify the automatically-generated package-data.mk
                 -- bindings in a special way for the GHC build system, so allow that here:
@@ -393,13 +393,13 @@ generate config_args distdir directory
      escape = foldr (\c xs -> if c == '#' then '\\':'#':xs else c:xs) []
      wrap = mapM wrap1
      wrap1 s
-      | null s        = die "Wrapping empty value"
-      | '\'' `elem` s = die "Single quote in value to be wrapped"
+      | null s        = die ["Wrapping empty value"]
+      | '\'' `elem` s = die ["Single quote in value to be wrapped:", s]
       -- We want to be able to assume things like <space><quote> is the
       -- start of a value, so check there are no spaces in confusing
       -- positions
-      | head s == ' ' = die "Leading space in value to be wrapped"
-      | last s == ' ' = die "Trailing space in value to be wrapped"
+      | head s == ' ' = die ["Leading space in value to be wrapped:", s]
+      | last s == ' ' = die ["Trailing space in value to be wrapped:", s]
       | otherwise     = return ("\'" ++ s ++ "\'")
      boolToYesNo True = "YES"
      boolToYesNo False = "NO"