test/Makefile: Reapply r127079, use $(ECHOPATH) to make lit.site.cfg(s).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@127284 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index b0c829c255e6d2c1738a20e8e0bbad229969d6b8..050c3a51ddec7599fa9f3c262a6842e51239eafb 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,30 +38,32 @@ FORCE:
 
 lit.site.cfg: FORCE
        @echo "Making Clang 'lit.site.cfg' file..."
-       @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
-            -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
-            -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
-            -e "s#@LLVM_LIBS_DIR@#$(LibDir)#g" \
-            -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \
-            -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \
-            -e "s#@TARGET_TRIPLE@#$(TARGET_TRIPLE)#g" \
-            $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+       @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > lit.tmp
+       @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> lit.tmp
+       @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> lit.tmp
+       @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> lit.tmp
+       @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> lit.tmp
+       @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> lit.tmp
+       @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> lit.tmp
+       @sed -f lit.tmp $(PROJ_SRC_DIR)/lit.site.cfg.in > $@
+       @-rm -f lit.tmp
 
 Unit/lit.site.cfg: FORCE
        @echo "Making Clang 'Unit/lit.site.cfg' file..."
        @$(MKDIR) $(dir $@)
-       @sed -e "s#@LLVM_SOURCE_DIR@#$(LLVM_SRC_ROOT)#g" \
-            -e "s#@LLVM_BINARY_DIR@#$(LLVM_OBJ_ROOT)#g" \
-            -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \
-            -e "s#@LLVM_LIBS_DIR@#$(LibDir)#g" \
-            -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \
-            -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \
-            -e "s#@TARGET_TRIPLE@#$(TARGET_TRIPLE)#g" \
-            -e "s#@LLVM_BUILD_MODE@#$(BuildMode)#g" \
-            -e "s#@ENABLE_SHARED@#$(ENABLE_SHARED)#g" \
-            -e "s#@SHLIBDIR@#$(SharedLibDir)#g" \
-            -e "s#@SHLIBPATH_VAR@#$(SHLIBPATH_VAR)#g" \
-            $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
+       @$(ECHOPATH) s=@LLVM_SOURCE_DIR@=$(LLVM_SRC_ROOT)=g > unit.tmp
+       @$(ECHOPATH) s=@LLVM_BINARY_DIR@=$(LLVM_OBJ_ROOT)=g >> unit.tmp
+       @$(ECHOPATH) s=@LLVM_TOOLS_DIR@=$(ToolDir)=g >> unit.tmp
+       @$(ECHOPATH) s=@LLVM_LIBS_DIR@=$(LibDir)=g >> unit.tmp
+       @$(ECHOPATH) s=@CLANG_SOURCE_DIR@=$(PROJ_SRC_DIR)/..=g >> unit.tmp
+       @$(ECHOPATH) s=@CLANG_BINARY_DIR@=$(PROJ_OBJ_DIR)/..=g >> unit.tmp
+       @$(ECHOPATH) s=@TARGET_TRIPLE@=$(TARGET_TRIPLE)=g >> unit.tmp
+       @$(ECHOPATH) s=@LLVM_BUILD_MODE@=$(BuildMode)=g >> unit.tmp
+       @$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> unit.tmp
+       @$(ECHOPATH) s=@SHLIBDIR@=$(SharedLibDir)=g >> unit.tmp
+       @$(ECHOPATH) s=@SHLIBPATH_VAR@=$(SHLIBPATH_VAR)=g >> unit.tmp
+       @sed -f unit.tmp $(PROJ_SRC_DIR)/Unit/lit.site.cfg.in > $@
+       @-rm -f unit.tmp
 
 clean::
        @ find . -name Output | xargs rm -fr