Mercurial > mxe-octave

comparison src/mingw-osmesa-1-fixes.patch @ 3973:4f586cfb8438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osmesa: update for msys2 build * src/mingw-osmesa-1-fixes.patch: add extra check for tools name if cant find it
author John Donoghue
date Tue, 16 Jun 2015 12:12:49 -0400
parents a169ad26bac2
children 7d6f1fd0d672
comparison
equal deleted inserted replaced
3972:40b0b14d7eef 3973:4f586cfb8438
10 - if 'w64' in env['CC'].split('-'): 10 - if 'w64' in env['CC'].split('-'):
11 - linkflags += ['-static-libstdc++'] 11 - linkflags += ['-static-libstdc++']
12 # Handle the @xx symbol munging of DLL exports 12 # Handle the @xx symbol munging of DLL exports
13 shlinkflags += ['-Wl,--enable-stdcall-fixup'] 13 shlinkflags += ['-Wl,--enable-stdcall-fixup']
14 #shlinkflags += ['-Wl,--kill-at'] 14 #shlinkflags += ['-Wl,--kill-at']
15 diff -ur Mesa-10.2.2.orig/scons/crossmingw.py Mesa-10.2.2/scons/crossmingw.py
16 --- Mesa-10.2.2.orig/scons/crossmingw.py 2015-06-12 06:33:42.524589500 -0400
17 +++ Mesa-10.2.2/scons/crossmingw.py 2015-06-12 22:12:26.181163800 -0400
18 @@ -160,7 +160,11 @@
19 env.Append(SHLIBEMITTER = [shlib_emitter])
20 env['LINK'] = mingw_prefix + 'g++'
21 env['AR'] = mingw_prefix + 'ar'
22 + if not SCons.Util.WhereIs(env['AR']):
23 + env['AR'] = env['CC'] + '-ar'
24 env['RANLIB'] = mingw_prefix + 'ranlib'
25 + if not SCons.Util.WhereIs(env['RANLIB']):
26 + env['RANLIB'] = env['CC'] + '-ranlib'
27 env['LINK'] = mingw_prefix + 'g++'
28 env['AS'] = mingw_prefix + 'as'
29 env['WIN32DEFPREFIX'] = ''