Minor cleanups, no functionality change.

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index dd307a14351875da4b4d248dec2f85a606e829bb..1e75acf187b9a72e781e2b502d0c42fa7e339f09 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -222,8 +222,8 @@ else
   endif
 endif
 
-# If ENABLE_ASSERTIONS=1 is specified (make command line or configured),
-# then enable assertions by defining the appropriate preprocessor symbols.
+# If DISABLE_ASSERTIONS=1 is specified (make command line or configured),
+# then disable assertions by defining the appropriate preprocessor symbols.
 ifdef DISABLE_ASSERTIONS
   BuildMode := $(BuildMode)-Asserts
   CXX.Flags += -DNDEBUG
@@ -269,9 +269,6 @@ endif
 ifndef LLVMAS
 LLVMAS   := $(LLVMToolDir)/llvm-as$(EXEEXT)
 endif
-ifndef BURG
-BURG     := $(LLVMToolDir)/burg$(EXEEXT)
-endif
 ifndef TBLGEN
 TBLGEN   := $(LLVMToolDir)/tblgen$(EXEEXT)
 endif
@@ -362,7 +359,11 @@ endif
 # If we are building a universal binary on Mac OS/X, pass extra options.  This is
 # useful to people that want to link the LLVM libraries into their universal apps.
 ifdef UNIVERSAL
-  CompileCommonOpts += -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
+  CompileCommonOpts += \
+      -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/
+  Relink.Flags := -XCClinker -arch -XCClinker i386 -XCClinker -arch \
+      -XCClinker ppc -XCClinker \
+      -isysroot -XCClinker /Developer/SDKs/MACOSX10.4u.sdk/
   DISABLE_AUTO_DEPENDENCIES=1
 endif
 
@@ -397,13 +398,12 @@ Preprocess.CXX= $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -E
 Link          = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
                $(CompileCommonOpts) $(LD.Flags) $(Strip)
 Relink        = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
-                $(CompileCommonOpts)
+                $(CompileCommonOpts) $(Relink.Flags)
 LTInstall     = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) \
                $(Install.Flags)
 ProgInstall   = $(INSTALL) $(Install.StripFlag) -m 0755 
 ScriptInstall = $(INSTALL) -m 0755 
 DataInstall   = $(INSTALL) -m 0644
-Burg          = $(BURG) -I $(PROJ_SRC_DIR)
 TableGen      = $(TBLGEN) -I $(PROJ_SRC_DIR) -I$(PROJ_SRC_ROOT)/include
 Archive       = $(AR) $(AR.Flags)
 LArchive      = $(LLVMToolDir)/llvm-ar rcsf
@@ -604,21 +604,6 @@ ifdef ENABLE_X86_JIT
   JIT_LIBS += LLVMX86 LLVMSelectionDAG
 endif
 
-# You can enable the SparcV9 JIT on a non-SparcV9 host by setting the flag
-# ENABLE_SPARCV9_JIT on the make command line. If not, it will still be
-# enabled automagically on an SparcV9 host.
-ifeq ($(ARCH), Sparc)
-  ENABLE_SPARCV9_JIT = 1
-endif
-
-# What the Sparc JIT requires
-ifdef ENABLE_SPARCV9_JIT
-  JIT_LIBS += LLVMSparcV9 LLVMSparcV9ModuloSched LLVMSparcV9InstrSched \
-              LLVMSparcV9LiveVar LLVMInstrumentation.a \
-              LLVMBCWriter LLVMTransforms.a LLVMipo.a LLVMipa.a \
-              LLVMDataStructure LLVMSparcV9RegAlloc
-endif
-
 # You can enable the PowerPC JIT on a non-PowerPC host by setting the flag
 # ENABLE_PPC_JIT on the make command line. If not, it will still be
 # enabled automagically on an PowerPC host.
@@ -690,7 +675,8 @@ $(warning Modules require llvm-gcc but no llvm-gcc is available ****)
 else
 
 Module     := $(LibDir)/$(MODULE_NAME).bc
-LinkModule := $(GCCLD)
+LinkModule := $(GCCLD) -L$(CFERuntimeLibDir)
+
 
 ifdef EXPORTED_SYMBOL_FILE
 LinkModule += -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
@@ -800,7 +786,7 @@ else
 all-local:: $(LibName.BCA)
 
 ifdef EXPORTED_SYMBOL_FILE
-BCLinkLib = $(GCCLD) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
+BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
 
 $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \
                 $(LLVMToolDir)/llvm-ar
@@ -1502,8 +1488,6 @@ dist-check:: $(DistTarGZip)
          $(MAKE) check && \
          $(MAKE) install && \
          $(MAKE) uninstall && \
-         $(MAKE) dist && \
-         $(MAKE) clean && \
          $(MAKE) dist-clean && \
          $(EchoCmd) ===== $(DistTarGZip) Ready For Distribution =====
 
@@ -1527,7 +1511,7 @@ $(DistDir)/.makedistdir: $(DistSources)
          $(EchoCmd) Removing old $(DistDir) ; \
          $(RM) -rf $(DistDir); \
          $(EchoCmd) Making 'all' to verify build ; \
-         $(MAKE) ENABLE_OPTIMIZED=1 ENABLE_ASSERTIONS=1 all ; \
+         $(MAKE) ENABLE_OPTIMIZED=1 all ; \
        fi
        $(Echo) Building Distribution Directory $(DistDir)
        $(Verb) $(MKDIR) $(DistDir) 
@@ -1588,7 +1572,7 @@ $(DistDir)/.makedistdir: $(DistSources)
          if test "$$subdir" \!= "." ; then \
            new_distdir="$(DistDir)/$$subdir" ; \
            test -d "$$new_distdir" || $(MKDIR) "$$new_distdir" || exit 1; \
-           ( cd $$subdir && $(MAKE) ENABLE_OPTIMIZED=1 ENABLE_ASSERTIONS=1 \
+           ( cd $$subdir && $(MAKE) ENABLE_OPTIMIZED=1 \
              DistDir="$$new_distdir" distdir ) || exit 1; \
          fi; \
        done