diff options
| author | Sven Gothel <[email protected]> | 2015-07-19 01:21:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-07-19 01:21:42 +0200 |
| commit | ad064d8dd94f44093fe196edd4a2dfb6c3a0a8fa (patch) | |
| tree | b4a08a17343e3df8e789157798ac7bbb03daebcc /make/lib | |
| parent | 708a163e333e9e7786c1828d028c8ca10b584f47 (diff) | |
GCC Linker Config: Add '-static-libstdc++' in case libstdc++ is being linked
Linking libstdc++ dynamically might cause issues on platforms
where a huge variation of named library exists - or none even is installed.
Diffstat (limited to 'make/lib')
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-aarch64.xml | 3 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-android-armv6.xml | 3 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv6.xml | 3 | ||||
| -rw-r--r-- | make/lib/gluegen-cpptasks-linux-armv6hf.xml | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml index de1e1da..c6956f4 100644 --- a/make/lib/gluegen-cpptasks-android-aarch64.xml +++ b/make/lib/gluegen-cpptasks-android-aarch64.xml @@ -108,7 +108,8 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$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-armv6.xml b/make/lib/gluegen-cpptasks-android-armv6.xml index 46b79eb..57999b2 100644 --- a/make/lib/gluegen-cpptasks-android-armv6.xml +++ b/make/lib/gluegen-cpptasks-android-armv6.xml @@ -110,7 +110,8 @@ <linkerarg value="--demangle" /> <linkerarg value="--gc-sections" /> <linkerarg value="--no-undefined" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- The gcc from $NDK_TOOLCHAIN_ROOT/$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 33f5891..5b65b42 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6.xml @@ -56,7 +56,8 @@ <linkerarg value="-mfloat-abi=softfp" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> </target> diff --git a/make/lib/gluegen-cpptasks-linux-armv6hf.xml b/make/lib/gluegen-cpptasks-linux-armv6hf.xml index 3e0a95a..df5a91c 100644 --- a/make/lib/gluegen-cpptasks-linux-armv6hf.xml +++ b/make/lib/gluegen-cpptasks-linux-armv6hf.xml @@ -56,7 +56,8 @@ <linkerarg value="-mfloat-abi=hard" /> <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> - <linkerarg value="-static-libgcc"/> + <linkerarg value="-static-libgcc" if="isGCC"/> + <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> </target> |