build/Make: Switch back to llvm-config for now, I foolishly forgot to think

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index e82549d7075052a23cea04132fa9ebfd222562ce..6b68cf2c6b862641a10bd417244cf0912742a90e 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -92,6 +92,8 @@ LLVMConfigLibraryDependenciesInc := \
 $(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules
        $(Echo) Constructing LLVMBuild project information.
        $(Verb) $(LLVMBuildTool) \
+         --native-target "$(ARCH)" \
+         --enable-targets "$(TARGETS_TO_BUILD)" \
          --write-library-table $(LLVMConfigLibraryDependenciesInc) \
          --write-make-fragment $(LLVMBuildMakeFrag)
 
@@ -299,6 +301,9 @@ else
   endif
 endif
 
+#CXX.Flags +=  -stdlib=libc++
+#LD.Flags +=  -stdlib=libc++
+
 ifeq ($(ENABLE_PROFILING),1)
   BuildMode := $(BuildMode)+Profile
   CXX.Flags := $(filter-out -fomit-frame-pointer,$(CXX.Flags)) -pg -g
@@ -1880,7 +1885,6 @@ clean-local::
 ifneq ($(strip $(ObjRootDir)),)
        -$(Verb) $(RM) -rf $(ObjRootDir)
 endif
-       -$(Verb) $(RM) -f core core.[0-9][0-9]* *.o *.d *~ *.flc
 ifneq ($(strip $(SHLIBEXT)),) # Extra paranoia - make real sure SHLIBEXT is set
        -$(Verb) $(RM) -f *$(SHLIBEXT)
 endif