From 60499275aac37cca0b8ff5eaccc5e14bd16192cb Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 20 Oct 2009 11:11:03 +0000 Subject: [PATCH] Don't cross-compile on OSX for the runtime build --- makepanda/makepanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 771652c6dc..365dbad274 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -578,7 +578,7 @@ def CompileCxx(obj,src,opts): for (opt,var,val) in DEFSYMBOLS: if (opt=="ALWAYS") or (opts.count(opt)): cmd += ' -D' + var + '=' + val for x in ipath: cmd += ' -I' + x - if (sys.platform == "darwin"): + if (sys.platform == "darwin" and not RUNTIME): if (int(platform.mac_ver()[0][3]) >= 6): cmd += " -isysroot " + SDK["MACOSX"] + " -arch x86_64" else: @@ -814,7 +814,7 @@ def CompileLink(dll, obj, opts): cmd += " -lpthread" if (not sys.platform.startswith("freebsd")): cmd += " -ldl" - if (sys.platform == "darwin"): + if (sys.platform == "darwin" and not RUNTIME): cmd += " -isysroot " + SDK["MACOSX"] + " -Wl,-syslibroot," + SDK["MACOSX"] + " -arch i386" if ("NOPPC" not in opts): cmd += " -arch ppc"