Fix #4346 (INLINABLE pragma not behaving consistently)

[ghc-hetmet.git] / utils / ghc-cabal / ghc.mk

diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index d0f3bd5..448dd46 100644 (file)
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -27,6 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/D
 
 $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/ghc-cabal.hs | $$(dir $$@)/. bootstrapping/.
        "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/ghc-cabal.hs -o $@ \
+              -no-user-package-conf \
               -Wall $(WERROR) \
               -DCABAL_VERSION=$(CABAL_VERSION) \
               -odir  bootstrapping \
@@ -79,9 +80,11 @@ $(GHC_CABAL_DIR)/dist-dummy-ghc/build/dummy-ghc.hs : $(GHC_CABAL_DIR)/ghc.mk $(M
 #   ( "PostfixOperators", ...
 # then it translates them into
 #   ["PostfixOperators"] ++
+# Tabs are a pain to handle portably with sed, so rather than worrying
+# about them we just use tr to remove them all before we start.
        echo 'extensions :: [String]'                                     >> $@
        echo 'extensions ='                                               >> $@
-       sed '/^xFlags/,/]/s/^[[:space:]]*([[:space:]]*\("[^"]*"\)[^"]*/  [\1] ++/p;d' compiler/main/DynFlags.hs >> $@
+       '$(TR)' -d '\t' < compiler/main/DynFlags.hs | '$(SED)' '/^xFlags/,/]/s/^ *( *\("[^"]*"\)[^"]*/  [\1] ++/p;d' >> $@
        echo '  []'                                                       >> $@
 
 # We don't build dummy-ghc with Cabal, so we need to pass -package