summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2013-03-28 09:55:53 +0000
committerTim Angus <tim@ngus.net>2013-05-03 16:07:35 +0100
commitb2713a6c1785e63e44f276b0d6994f3551c3446c (patch)
tree7d6c7201f0612172f6daf3e63b9e278af614135c /Makefile
parentb9374dfb56e7011204844029946cd814f425a65a (diff)
Fix OSX app/ub scripts
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e631f37b..40629b08 100644
--- a/Makefile
+++ b/Makefile
@@ -413,6 +413,13 @@ ifeq ($(PLATFORM),darwin)
OPTIMIZEVM += -arch x86_64 -mfpmath=sse
endif
+ # When compiling on OSX for OSX, we're not cross compiling as far as the
+ # Makefile is concerned, as target architecture is specified as a compiler
+ # argument
+ ifeq ($(COMPILE_PLATFORM),darwin)
+ CROSS_COMPILING=0
+ endif
+
ifeq ($(CROSS_COMPILING),1)
ifeq ($(ARCH),ppc)
CC=powerpc-apple-darwin10-gcc