Revert commit 145449 (ddunbar) since it is breaking the dragonegg buildbots.

[oota-llvm.git] / tools / llvm-config / Makefile

diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 5ceef2e85d49a550ac5174a1a63f69d7660bb53a..184919ea9711522c43329ac78268540c3ab97993 100644 (file)
--- a/tools/llvm-config/Makefile
+++ b/tools/llvm-config/Makefile
@@ -2,15 +2,14 @@
 #
 #                     The LLVM Compiler Infrastructure
 #
-# This file was developed by Reid Spencer and Eric Kidd and is distributed under
-# the University of Illinois Open Source License. See LICENSE.TXT for details.
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
 
 EXTRA_DIST = LibDeps.txt FinalLibDeps.txt llvm-config.in.in find-cycles.pl
-REQUIRES_EH := 1
 
 include $(LEVEL)/Makefile.common
 
@@ -20,8 +19,8 @@ include $(LEVEL)/Makefile.common
 ifeq ($(HAVE_PERL),1)
 
 # Combine preprocessor flags (except for -I) and CXX flags.
-SUB_CPPFLAGS = ${CPP.Defines}
-SUB_CFLAGS = ${CPP.BaseFlags} ${C.Flags}
+SUB_CPPFLAGS = ${CPP.BaseFlags}
+SUB_CFLAGS   = ${CPP.BaseFlags} ${C.Flags}
 SUB_CXXFLAGS = ${CPP.BaseFlags} ${CXX.Flags}
 
 # This is blank for now.  We need to be careful about adding stuff here:
@@ -36,7 +35,7 @@ GenLibDeps   = $(PROJ_SRC_ROOT)/utils/GenLibDeps.pl
 
 $(LibDepsTemp): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
        $(Echo) "Regenerating LibDeps.txt.tmp"
-       $(Verb) $(PERL) $(GenLibDeps) -flat $(LibDir) $(NM_PATH) > $(LibDepsTemp)
+       $(Verb) $(PERL) $(GenLibDeps) -flat $(LibDir) "$(NM_PATH)" > $(LibDepsTemp)
 
 $(LibDeps): $(LibDepsTemp)
        $(Verb) $(CMP) -s $@ $< || ( $(CP) $< $@ && \
@@ -57,11 +56,18 @@ 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) $(ECHO) 's/@LLVM_OBJ_SUFFIX@/$(subst /,\/,/$(BuildMode))/' \
+         >> temp.sed
        $(Verb) $(SED) -f temp.sed < $< > $@
        $(Verb) $(RM) temp.sed
        $(Verb) cat $(FinalLibDeps) >> $@
@@ -82,6 +88,6 @@ clean-local::
          $(LibDeps) GenLibDeps.out
 install-local:: all-local
        $(Echo) Installing llvm-config
-       $(Verb) $(MKDIR) $(PROJ_bindir)
-       $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(PROJ_bindir)
+       $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_bindir)
+       $(Verb) $(ScriptInstall) $(ToolDir)/llvm-config $(DESTDIR)$(PROJ_bindir)