Mesa (mesa_7_7_branch): scons: Do not use ld options start-group and end-group on Darwin.
Vinson Lee
vlee at kemper.freedesktop.org
Sun Jan 24 05:45:50 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: 6b55aacccbbc2c86f03eafab23d5d74bc165c9ed
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b55aacccbbc2c86f03eafab23d5d74bc165c9ed
Author: Vinson Lee <vlee at vmware.com>
Date: Sat Jan 23 21:43:26 2010 -0800
scons: Do not use ld options start-group and end-group on Darwin.
Mac OS X ld does not support these options.
---
scons/gallium.py | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index f4e82e8..2d963a5 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -476,7 +476,10 @@ def generate(env):
'-Wl,-Bsymbolic',
]
# Handle circular dependencies in the libraries
- env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
+ if env['platform'] in ('darwin'):
+ pass
+ else:
+ env['_LIBFLAGS'] = '-Wl,--start-group ' + env['_LIBFLAGS'] + ' -Wl,--end-group'
if msvc:
if not env['debug']:
# enable Link-time Code Generation
More information about the mesa-commit
mailing list