[llvm-branch-commits] [llvm-branch] r111157 - in /llvm/branches/Apple/Pertwee: ./ utils/buildit/GNUmakefile

[Bob Wilson]

Author: bwilson
Date: Mon Aug 16 12:20:08 2010
New Revision: 111157

URL: http://llvm.org/viewvc/llvm-project?rev=111157&view=rev
Log:
--- Merging r111149 into '.':
U    utils/buildit/GNUmakefile

Modified:
    llvm/branches/Apple/Pertwee/   (props changed)
    llvm/branches/Apple/Pertwee/utils/buildit/GNUmakefile

Propchange: llvm/branches/Apple/Pertwee/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 16 12:20:08 2010
@@ -1 +1 @@
-/llvm/trunk:109842,109879,110152,110170,110233,110248-110249,110254,110269,110279,110366,110589,110614,110687
+/llvm/trunk:109842,109879,110152,110170,110233,110248-110249,110254,110269,110279,110366,110589,110614,110687,111149

Modified: llvm/branches/Apple/Pertwee/utils/buildit/GNUmakefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Pertwee/utils/buildit/GNUmakefile?rev=111157&r1=111156&r2=111157&view=diff
==============================================================================
--- llvm/branches/Apple/Pertwee/utils/buildit/GNUmakefile (original)
+++ llvm/branches/Apple/Pertwee/utils/buildit/GNUmakefile Mon Aug 16 12:20:08 2010
@@ -71,14 +71,14 @@
 	    $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
 
 EmbeddedHosted:
-	$(MAKE) ARM_HOSTED_BUILD=yes PREFIX=/usr install
+	$(MAKE) ARM_HOSTED_BUILD=yes PREFIX=/usr/local install
 
 # When building for the iOS simulator, MACOSX_DEPLOYMENT_TARGET is not set
 # by default, but it needs to be set when building tools that run on the host
 # (e.g., tblgen), so set it here.
 EmbeddedSim:
 	export MACOSX_DEPLOYMENT_TARGET=`sw_vers -productVersion`; \
-	$(MAKE) IOS_SIM_BUILD=yes PREFIX=$(SDKROOT)/usr install
+	$(MAKE) IOS_SIM_BUILD=yes PREFIX=$(SDKROOT)/usr/local install
 
 # installhdrs does nothing, because the headers aren't useful until
 # the compiler is installed.