diff options
| author | Dan Gohman <gohman@apple.com> | 2009-03-10 19:01:23 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-03-10 19:01:23 +0000 |
| commit | 02ba62c10695897846832ec3197c033cd64d95cb (patch) | |
| tree | 4168549ea2dce3e3228658971d053bc60d2951c2 | |
| parent | 2a72edd4131f1aacc824cb20f62f17534aa8a0f2 (diff) | |
| download | bcm5719-llvm-02ba62c10695897846832ec3197c033cd64d95cb.tar.gz bcm5719-llvm-02ba62c10695897846832ec3197c033cd64d95cb.zip | |
Change these sed lines to behave correctly when the input string
contains commas. This fixes PR3727.
llvm-svn: 66565
| -rw-r--r-- | llvm/tools/llvm-config/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/llvm/tools/llvm-config/Makefile b/llvm/tools/llvm-config/Makefile index de89d290353..6eedca07b50 100644 --- a/llvm/tools/llvm-config/Makefile +++ b/llvm/tools/llvm-config/Makefile @@ -57,11 +57,16 @@ llvm-config.in: $(ConfigInIn) $(ConfigStatusScript) # Build our final script. $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps) $(Echo) "Building llvm-config script." - $(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed - $(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed - $(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed - $(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed - $(Verb) $(ECHO) 's,@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) >> $@ |
