Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 170305 | Differences between
and this patch

Collapse All | Expand All

(-)./make/gluegen-cpptasks-base.xml (-13 lines)
Lines 1218-1236 Link Here
1218
1218
1219
    <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
1219
    <linker id="linker.cfg.linux" name="${gcc.compat.compiler}">
1220
      <linkerarg value="-static-libgcc" if="isGCC"/>
1220
      <linkerarg value="-static-libgcc" if="isGCC"/>
1221
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1222
    </linker>
1221
    </linker>
1223
1222
1224
    <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
1223
    <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}">
1225
      <linkerarg value="-m32"/>
1224
      <linkerarg value="-m32"/>
1226
      <linkerarg value="-static-libgcc" if="isGCC"/>
1225
      <linkerarg value="-static-libgcc" if="isGCC"/>
1227
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1228
    </linker>
1226
    </linker>
1229
1227
1230
    <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
1228
    <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}">
1231
      <linkerarg value="-m64"/>
1229
      <linkerarg value="-m64"/>
1232
      <linkerarg value="-static-libgcc" if="isGCC"/>
1230
      <linkerarg value="-static-libgcc" if="isGCC"/>
1233
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1234
    </linker>
1231
    </linker>
1235
1232
1236
    <!-- Using default compiler settings - utilize:
1233
    <!-- Using default compiler settings - utilize:
Lines 1242-1248 Link Here
1242
      <linkerarg value="-nostdlib" />
1239
      <linkerarg value="-nostdlib" />
1243
      <linkerarg value="-Bdynamic" />
1240
      <linkerarg value="-Bdynamic" />
1244
      <linkerarg value="-static-libgcc" if="isGCC"/>
1241
      <linkerarg value="-static-libgcc" if="isGCC"/>
1245
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1246
    </linker>
1242
    </linker>
1247
1243
1248
    <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
1244
    <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}">
Lines 1250-1256 Link Here
1250
      <linkerarg value="-nostdlib" />
1246
      <linkerarg value="-nostdlib" />
1251
      <linkerarg value="-Bdynamic" />
1247
      <linkerarg value="-Bdynamic" />
1252
      <linkerarg value="-static-libgcc" if="isGCC"/>
1248
      <linkerarg value="-static-libgcc" if="isGCC"/>
1253
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1254
    </linker>
1249
    </linker>
1255
1250
1256
    <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
1251
    <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}">
Lines 1297-1315 Link Here
1297
    <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> 
1292
    <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> 
1298
      <linkerarg value="-m32"/>
1293
      <linkerarg value="-m32"/>
1299
      <linkerarg value="-static-libgcc" if="isGCC"/>
1294
      <linkerarg value="-static-libgcc" if="isGCC"/>
1300
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1301
    </linker> 
1295
    </linker> 
1302
1296
1303
    <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> 
1297
    <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> 
1304
      <linkerarg value="-xarch=v9a" /> 
1298
      <linkerarg value="-xarch=v9a" /> 
1305
      <linkerarg value="-static-libgcc" if="isGCC"/>
1299
      <linkerarg value="-static-libgcc" if="isGCC"/>
1306
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1307
    </linker> 
1300
    </linker> 
1308
1301
1309
    <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}"> 
1302
    <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}"> 
1310
      <linkerarg value="-m64"/>
1303
      <linkerarg value="-m64"/>
1311
      <linkerarg value="-static-libgcc" if="isGCC"/>
1304
      <linkerarg value="-static-libgcc" if="isGCC"/>
1312
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1313
      <!-- linkerarg value="-xarch=amd64" / --> 
1305
      <!-- linkerarg value="-xarch=amd64" / --> 
1314
    </linker>
1306
    </linker>
1315
1307
Lines 1325-1331 Link Here
1325
      <linkerarg value="x86_64" if="use.macosx64"/>
1317
      <linkerarg value="x86_64" if="use.macosx64"/>
1326
      <linkerarg value="-mmacosx-version-min=10.5"/>
1318
      <linkerarg value="-mmacosx-version-min=10.5"/>
1327
      <linkerarg value="-static-libgcc" if="isGCC"/>
1319
      <linkerarg value="-static-libgcc" if="isGCC"/>
1328
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1329
      <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
1320
      <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard -->
1330
    </linker>
1321
    </linker>
1331
1322
Lines 1335-1341 Link Here
1335
    <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
1326
    <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker">
1336
      <linkerarg value="-m64"/>
1327
      <linkerarg value="-m64"/>
1337
      <linkerarg value="-static-libgcc" if="isGCC"/>
1328
      <linkerarg value="-static-libgcc" if="isGCC"/>
1338
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1339
    </linker>
1329
    </linker>
1340
    
1330
    
1341
    <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
1331
    <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"-->
Lines 1343-1349 Link Here
1343
      <linkerarg value="-m32"/>
1333
      <linkerarg value="-m32"/>
1344
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1334
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1345
      <linkerarg value="-static-libgcc" if="isGCC"/>
1335
      <linkerarg value="-static-libgcc" if="isGCC"/>
1346
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1347
    </linker>
1336
    </linker>
1348
1337
1349
    <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
1338
    <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false">
Lines 1352-1358 Link Here
1352
      <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
1341
      <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
1353
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1342
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1354
      <linkerarg value="-static-libgcc" if="isGCC"/>
1343
      <linkerarg value="-static-libgcc" if="isGCC"/>
1355
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1356
    </linker>
1344
    </linker>
1357
1345
1358
    <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
1346
    <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false">
Lines 1361-1367 Link Here
1361
      <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
1349
      <linkerarg value="-Wl,--enable-stdcall-fixup"/>  <!-- for linking against dll directly -->
1362
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1350
      <linkerarg value="-Wl,--kill-at" />        <!-- remove @ from function names, ie no __stdcall @nn -->
1363
      <linkerarg value="-static-libgcc" if="isGCC"/>
1351
      <linkerarg value="-static-libgcc" if="isGCC"/>
1364
      <linkerarg value="-static-libstdc++" if="isGCC"/>
1365
    </linker>
1352
    </linker>
1366
1353
1367
    <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">
1354
    <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">

Return to bug 170305