Merge branch 'mesa_7_7_branch'
Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
This commit is contained in:
@@ -377,7 +377,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
|
||||
|
Reference in New Issue
Block a user