diff options
Diffstat (limited to 'make')
| -rwxr-xr-x | make/gluegen-cpptasks-base.xml | 12 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 1 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv7.xml | 1 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv6.xml | 1 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv6hf.xml | 1 |
5 files changed, 16 insertions, 0 deletions
diff --git a/make/gluegen-cpptasks-base.xml b/make/gluegen-cpptasks-base.xml index 8891695..723c7c2 100755 --- a/make/gluegen-cpptasks-base.xml +++ b/make/gluegen-cpptasks-base.xml @@ -1102,14 +1102,17 @@ <!-- Unix linker configuration --> <linker id="linker.cfg.linux" name="gcc"> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.linux.x86" name="gcc"> <linkerarg value="-m32"/> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.linux.amd64" name="gcc"> <linkerarg value="-m64"/> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.linux.armv6" name="gcc"> @@ -1119,6 +1122,7 @@ <linkerarg value="-mfloat-abi=softfp" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.linux.alpha" name="gcc"> @@ -1164,14 +1168,17 @@ <linker id="linker.cfg.solaris" name="gcc"> <linkerarg value="-m32"/> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.solaris.sparcv9" name="gcc"> <linkerarg value="-xarch=v9a" /> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.solaris.amd64" name="gcc"> <linkerarg value="-m64"/> + <linkerarg value="-static-libgcc"/> <!-- linkerarg value="-xarch=amd64" / --> </linker> @@ -1186,6 +1193,7 @@ <linkerarg value="-arch" if="use.macosx64"/> <linkerarg value="x86_64" if="use.macosx64"/> <linkerarg value="-mmacosx-version-min=10.5"/> + <linkerarg value="-static-libgcc"/> <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard --> </linker> @@ -1194,12 +1202,14 @@ <!--linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.Gcc64Linker"--> <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker"> <linkerarg value="-m64"/> + <linkerarg value="-static-libgcc"/> </linker> <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"--> <linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker"> <linkerarg value="-m32"/> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.win32.mingw" name="gcc" incremental="false"> @@ -1207,6 +1217,7 @@ <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.win64.mingw" name="gcc" incremental="false"> @@ -1214,6 +1225,7 @@ <linkerarg value="-Wl,--enable-auto-import"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> + <linkerarg value="-static-libgcc"/> </linker> <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false"> diff --git a/make/lib/gluegen-cpptasks-android-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index 1be5c1f..a6db2bc 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -88,6 +88,7 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> + <linkerarg value="-static-libgcc"/> <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also diff --git a/make/lib/gluegen-cpptasks-android-armv7.xml b/make/lib/gluegen-cpptasks-android-armv7.xml index a172fb5..dd7f5e9 100644 --- a/make/lib/gluegen-cpptasks-android-armv7.xml +++ b/make/lib/gluegen-cpptasks-android-armv7.xml @@ -88,6 +88,7 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> + <linkerarg value="-static-libgcc"/> <!-- The gcc from $NDK_TOOLCHAIN/$TARGET_TRIPLE/bin needs to be told where to find libgcc as the default location (gcc -print-search-dirs) is not correct. Not sure if this is a bug in the NDK or not. We also diff --git a/make/lib/gluegen-cpptasks-linux-armv6.xml b/make/lib/gluegen-cpptasks-linux-armv6.xml index d5267b8..a1b7eaa 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6.xml @@ -54,6 +54,7 @@ <linkerarg value="-mfloat-abi=softfp" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> + <linkerarg value="-static-libgcc"/> </linker> </target> diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml index 26f2db9..ed0b981 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml @@ -54,6 +54,7 @@ <linkerarg value="-mfloat-abi=hard" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> + <linkerarg value="-static-libgcc"/> </linker> </target> |