[cfe-commits] r82615 - /cfe/tags/Apple/clang/Makefile

Daniel Dunbar daniel at zuster.org
Tue Sep 22 23:10:04 PDT 2009


Author: ddunbar
Date: Wed Sep 23 01:10:03 2009
New Revision: 82615

URL: http://llvm.org/viewvc/llvm-project?rev=82615&view=rev
Log:
Fiddle with the Apple style build destination target logic to just take the
location to install.

Modified:
    cfe/tags/Apple/clang/Makefile

Modified: cfe/tags/Apple/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/Makefile?rev=82615&r1=82614&r2=82615&view=diff

==============================================================================
--- cfe/tags/Apple/clang/Makefile (original)
+++ cfe/tags/Apple/clang/Makefile Wed Sep 23 01:10:03 2009
@@ -36,22 +36,18 @@
 endif
 
 # Set destination information.
-ifneq ($(RC_PURPLE),)
-Install_Root := $(shell xcodebuild -version -sdk iphoneos.internal PlatformPath)
-Post_Install_RootLinks := 0
-Post_Install_OpenSourceLicense := 0
-else ifneq ($(RC_INDIGO),)
-Install_Root := $(shell xcodebuild -version -sdk iphonesimulator PlatformPath)
+ifneq ($(INSTALL_LOCATION),)
+Install_Root := $(INSTALL_LOCATION)
 Post_Install_RootLinks := 0
 Post_Install_OpenSourceLicense := 0
 else
-Install_Root := 
+Install_Root := /Developer
 Post_Install_RootLinks := 1
 Post_Install_OpenSourceLicense := 1
 endif
-Install_Prefix := $(Install_Root)/Developer/usr
+Install_Prefix := $(Install_Root)/usr
 
-# Validate that Install_Prefix exists.
+# Set and validate Install_Prefix exists.
 ifneq (OK, $(shell test -d $(Install_Prefix) && echo "OK"))
   $(error "invalid install prefix: '$(Install_Prefix)'")
 endif





More information about the cfe-commits mailing list