Merging r259381:

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

diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 11e5d3387710af57dae08d2367910de699b61279..d2fe2cfa34aadc6ef027b089316044368d636832 100644 (file)
--- a/tools/llvm-config/Makefile
+++ b/tools/llvm-config/Makefile
@@ -38,6 +38,12 @@ else
   LLVM_SYSTEM_LIBS := $(LIBS)
 endif
 
+ifneq ($(REQUIRES_RTTI), 1)
+  LLVM_HAS_RTTI := NO
+else
+  LLVM_HAS_RTTI := YES
+endif
+
 # This is blank for now.  We need to be careful about adding stuff here:
 # LDFLAGS tend not to be portable, and we don't currently require the
 # user to use libtool when linking against LLVM.
@@ -66,10 +72,16 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
        $(Verb) $(ECHO) 's/@LLVM_TARGETS_BUILT@/$(subst /,\/,$(TARGETS_TO_BUILD))/' \
          >> temp.sed
        $(if $(filter-out $(ENABLE_SHARED),0),\
-         $(Verb) $(ECHO) 's/@BUILD_SHARED_LIBS@/ON/',\
-         $(Verb) $(ECHO) 's/@BUILD_SHARED_LIBS@/OFF/') \
+         $(Verb) $(ECHO) 's/@LLVM_BUILD_LLVM_DYLIB@/ON/',\
+         $(Verb) $(ECHO) 's/@LLVM_BUILD_LLVM_DYLIB@/OFF/') \
+         >> temp.sed
+       $(Verb) $(ECHO) 's/@LLVM_ENABLE_SHARED@/OFF/' \
+         >> temp.sed
+       $(Verb) $(ECHO) 's/@LLVM_DYLIB_COMPONENTS@/all/' \
+         >> temp.sed
+       $(Verb) $(ECHO) 's/@LLVM_BUILD_SYSTEM@/autoconf/' \
          >> temp.sed
-       $(Verb) $(ECHO) 's/@WAS_BUILT_WITH_CMAKE@/OFF/' \
+       $(Verb) $(ECHO) 's/@LLVM_HAS_RTTI@/$(LLVM_HAS_RTTI)/' \
          >> temp.sed
        $(Verb) $(SED) -f temp.sed < $< > $@
        $(Verb) $(RM) temp.sed