Added %(line), %(line+<number>), %(line-<number>) substitutions to lit

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index ddf4d33d2f88482ce3df9b49b85c001791f6e10d..b2b02c25d44b66aabd98c819be68a1ba1df2c438 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -571,7 +571,11 @@ endif
 #--------------------------------------------------------------------
 
 ifeq ($(HOST_OS),Darwin)
+ ifdef MACOSX_DEPLOYMENT_TARGET
+  DARWIN_VERSION := $(MACOSX_DEPLOYMENT_TARGET)
+ else
   DARWIN_VERSION := `sw_vers -productVersion`
+ endif
   # Strip a number like 10.4.7 to 10.4
   DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
   # Get "4" out of 10.4 for later pieces in the makefile.
@@ -645,8 +649,7 @@ else
     LD.Flags += $(RPATH) -Wl,@executable_path/../lib
   endif
   ifeq ($(RC_BUILDIT),YES)
-    ObjDir   := $(shell mkdir -p ${OBJROOT}/dSYMs)
-    TempFile := $(shell mktemp ${ObjDir}/llvm-lto.XXXXXX)
+    TempFile := $(shell mkdir -p ${OBJROOT}/dSYMs ; mktemp ${OBJROOT}/dSYMs/llvm-lto.XXXXXX)
     LD.Flags += -Wl,-object_path_lto -Wl,$(TempFile)
   endif
 endif