[commit: ghc] master: Build system: fix sed expression (#11537) (f451039)

git at git.haskell.org git at git.haskell.org
Sun Feb 21 17:35:27 UTC 2016


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

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

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

commit f45103908348fb92ef9a16ab97ced87239a66783
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Feb 21 12:23:25 2016 +0100

    Build system: fix sed expression (#11537)
    
    This allows building ghc in '/ghc'.


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

f45103908348fb92ef9a16ab97ced87239a66783
 rules/build-dependencies.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index cdc1edf..8152691 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -145,7 +145,7 @@ endef
 define addCFileDeps
 
 	$(CPP) $($1_$2_MKDEPENDC_OPTS) $($1_$2_$(firstword $($1_$2_WAYS))_ALL_CC_OPTS) $($(basename $4)_CC_OPTS) -MM -x c $4 -MF $3.bit
-	$(foreach w,$5,sed -e 's|\\|/|g' -e 's| /$$| \\|' -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|$(TOP)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true
+	$(foreach w,$5,sed -e 's|\\|/|g' -e 's| /$$| \\|' -e "1s|\.o|\.$($w_osuf)|" -e "1s|^|$(dir $4)|" -e "1s|$1/|$1/$2/build/|" -e "1s|$2/build/$2/build|$2/build|g" -e "s|^$(TOP)/||g$(CASE_INSENSITIVE_SED)" $3.bit >> $3.tmp &&) true
 endef
 
 ifeq "$(Windows_Host)" "YES"



More information about the ghc-commits mailing list