[llvm-commits] [llvm] r66565 - /llvm/trunk/tools/llvm-config/Makefile

[Dan Gohman]

Author: djg
Date: Tue Mar 10 14:01:23 2009
New Revision: 66565

URL: http://llvm.org/viewvc/llvm-project?rev=66565&view=rev
Log:
Change these sed lines to behave correctly when the input string
contains commas. This fixes PR3727.

Modified:
    llvm/trunk/tools/llvm-config/Makefile

Modified: llvm/trunk/tools/llvm-config/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/Makefile?rev=66565&r1=66564&r2=66565&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/Makefile (original)
+++ llvm/trunk/tools/llvm-config/Makefile Tue Mar 10 14:01:23 2009
@@ -57,11 +57,16 @@
 # Build our final script.
 $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
 	$(Echo) "Building llvm-config script."
-	$(Verb) $(ECHO) 's, at LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
-	$(Verb) $(ECHO) 's, at LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
-	$(Verb) $(ECHO) 's, at LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
-	$(Verb) $(ECHO) 's, at LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
-	$(Verb) $(ECHO) 's, at LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
+	$(Verb) $(ECHO) 's/@LLVM_CPPFLAGS@/$(subst /,\/,$(SUB_CPPFLAGS))/' \
+	  > temp.sed
+	$(Verb) $(ECHO) 's/@LLVM_CFLAGS@/$(subst /,\/,$(SUB_CFLAGS))/' \
+	  >> temp.sed
+	$(Verb) $(ECHO) 's/@LLVM_CXXFLAGS@/$(subst /,\/,$(SUB_CXXFLAGS))/' \
+	  >> temp.sed
+	$(Verb) $(ECHO) 's/@LLVM_LDFLAGS@/$(subst /,\/,$(SUB_LDFLAGS))/' \
+	  >> temp.sed
+	$(Verb) $(ECHO) 's/@LLVM_BUILDMODE@/$(subst /,\/,$(BuildMode))/' \
+	  >> temp.sed
 	$(Verb) $(SED) -f temp.sed < $< > $@
 	$(Verb) $(RM) temp.sed
 	$(Verb) cat $(FinalLibDeps) >> $@