From 0183f3978ac38e3c417d96020412db0930b8f849 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Thu, 28 Mar 2013 09:55:53 +0000
Subject: [PATCH] Fix OSX app/ub scripts

---
 Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Makefile b/Makefile
index babd691f..e516b9a3 100644
--- a/Makefile
+++ b/Makefile
@@ -425,6 +425,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