summaryrefslogtreecommitdiffstats
path: root/gears/SConscript
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 20:23:01 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-14 20:23:01 +0000
commitd924c436f199eb90b3d5c10e8d5aedd991de4f1d (patch)
tree7b5b127eca25377c5f0b1d2e1bd7e7b3367bed46 /gears/SConscript
parent295659c7f84cc46843da8b602b60b682059237a1 (diff)
downloadchromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.zip
chromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.tar.gz
chromium_src-d924c436f199eb90b3d5c10e8d5aedd991de4f1d.tar.bz2
Fix SF, FF2, and FF3 builds on osx in gears-scons build. OFFICIAL_BUILD=0 now
works as well. Review URL: http://codereview.chromium.org/10923 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript')
-rw-r--r--gears/SConscript15
1 files changed, 7 insertions, 8 deletions
diff --git a/gears/SConscript b/gears/SConscript
index f300de3..4bdb0c7 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -634,6 +634,7 @@ elif env['OS'] == 'osx':
'$THIRD_PARTY_DIR/breakpad_osx/src',
],
CCFLAGS = [
+ '-mmacosx-version-min=10.4',
('-arch', 'ppc'),
('-arch', 'i386'),
'-fPIC',
@@ -667,15 +668,13 @@ elif env['OS'] == 'osx':
('-isysroot', '$OSX_SDK_ROOT')
],
LINKFLAGS = [
- '-fPIC',
+ '-mmacosx-version-min=10.4',
+ '-fPIC',
'-Bsymbolic',
- '-arch',
- 'ppc',
- '-arch',
- 'i386',
- '-isysroot',
- '$OSX_SDK_ROOT',
- '-Wl,-dead_strip'
+ ('-arch', 'ppc'),
+ ('-arch', 'i386'),
+ ('-isysroot', '$OSX_SDK_ROOT'),
+ '-Wl,-dead_strip',
],
)
if env['MODE'] == 'dbg':