New testcase. Unfortunately, native GCC gets this wrong. Someday we will have to...

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 5c004b32478b1ccb17ef0c55d3a1106ad8fc0f27..9f0c523735ae902d3192721e5fbfc1475925ecf6 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -32,9 +32,6 @@
 #
 # 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
 #
-# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM
-#    object files are placed.
-#
 # 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles
 #    and usually the source code too (unless SourceDir is set).
 #
@@ -46,15 +43,18 @@
 #     placed.
 #
 # For building,
-#      LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and
-#      LLVM_OBJ_ROOT = BUILD_OBJ_ROOT.
+#      LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT
 #
 #===-----------------------------------------------------------------------====
 
 #
 # Configuration file to set paths specific to local installation of LLVM
 # 
+ifdef LLVM_SRC_ROOT
+include $(LLVM_SRC_ROOT)/Makefile.config
+else
 include $(LEVEL)/Makefile.config
+endif
 
 ###########################################################################
 # Directory Configuration
@@ -116,18 +116,22 @@ endif
 endif
 
 #
-# Set the LLVM source directory.
-# It is typically the root directory of what we're compiling now.
+# Set the LLVM object directory.
 #
-ifndef LLVM_SRC_ROOT
-LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
+ifndef LLVM_OBJ_ROOT
+ifdef LLVM_SRC_ROOT
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_DIR); cd $(LLVM_SRC_ROOT); pwd)
+else
+LLVM_OBJ_ROOT := $(shell cd $(BUILD_OBJ_ROOT); pwd)
+endif
 endif
 
 #
-# Set the LLVM object directory.
+# Set the LLVM source directory.
+# It is typically the root directory of what we're compiling now.
 #
-ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT := $(BUILD_OBJ_ROOT)
+ifndef LLVM_SRC_ROOT
+LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
 ###########################################################################
@@ -161,13 +165,13 @@ bytecode::
 
 # Print out the directories used for building
 prdirs::
-       echo "Home Offset      : " $(HOME_OBJ_ROOT)
-       echo "Build Source Root: " $(BUILD_SRC_ROOT)
-       echo "Build Source Dir : " $(BUILD_SRC_DIR)
-       echo "Build Object Root: " $(BUILD_OBJ_ROOT)
-       echo "Build Object Dir : " $(BUILD_OBJ_DIR)
-       echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
-       echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
+       @echo "Home Offset      : " $(HOME_OBJ_ROOT)
+       @echo "Build Source Root: " $(BUILD_SRC_ROOT)
+       @echo "Build Source Dir : " $(BUILD_SRC_DIR)
+       @echo "Build Object Root: " $(BUILD_OBJ_ROOT)
+       @echo "Build Object Dir : " $(BUILD_OBJ_DIR)
+       @echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
+       @echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
 
 ###########################################################################
 # Suffixes and implicit rules:
@@ -357,7 +361,7 @@ CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
 # Compile commands with libtool.
 #
 Compile  := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
-CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
+CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CompileCommonOpts)
 
 # Compile a cpp file, don't link...
 CompileG := $(Compile) -g  -D_DEBUG
@@ -814,6 +818,8 @@ clean::
 #      from C/C++ source files.
 ###########################################################################
 
+ifndef DISABLE_AUTO_DEPENDENCIES
+
 # If dependencies were generated for the file that included this file,
 # include the dependencies now...
 #
@@ -842,6 +848,4 @@ endif
 endif
 endif
 
-cleandeps::
-       $(VERB) rm -f $(SourceDepend)
-
+endif  # ifndef DISABLE_AUTO_DEPENDENCIES