mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-21 21:57:48 +00:00
Merge branch 'with-host-libstdcxx' of https://github.com/foss-for-synopsys-dwc-arc-processors/crosstool-ng
Signed-off-by: Chris Packham <judge.packham@gmail.com>
This commit is contained in:
commit
bc4b8c790b
@ -436,9 +436,11 @@ do_gcc_core_backend() {
|
||||
# with the same block in do_gcc_backend, below.
|
||||
if [ "${build_staticlinked}" = "yes" ]; then
|
||||
core_LDFLAGS+=("-static")
|
||||
host_libstdcxx_flags+=("-static-libgcc")
|
||||
host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++")
|
||||
host_libstdcxx_flags+=("-lm")
|
||||
if [ "${CT_GCC_older_than_6}" = "y" ]; then
|
||||
host_libstdcxx_flags+=("-static-libgcc")
|
||||
host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++")
|
||||
host_libstdcxx_flags+=("-lm")
|
||||
fi
|
||||
# Companion libraries are build static (eg !shared), so
|
||||
# the libstdc++ is not pulled automatically, although it
|
||||
# is needed. Shoe-horn it in our LDFLAGS
|
||||
@ -446,7 +448,7 @@ do_gcc_core_backend() {
|
||||
core_LDFLAGS+=("-lstdc++")
|
||||
core_LDFLAGS+=("-lm")
|
||||
else
|
||||
if [ "${CT_CC_GCC_STATIC_LIBSTDCXX}" = "y" ]; then
|
||||
if [ "${CT_CC_GCC_STATIC_LIBSTDCXX}" = "y" -a "${CT_GCC_older_than_6}" = "y" ]; then
|
||||
# this is from CodeSourcery arm-2010q1-202-arm-none-linux-gnueabi.src.tar.bz2
|
||||
# build script
|
||||
# INFO: if the host gcc is gcc-4.5 then presumably we could use -static-libstdc++,
|
||||
@ -1084,9 +1086,11 @@ do_gcc_backend() {
|
||||
# with the same block in do_gcc_core_backend, above.
|
||||
if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
|
||||
final_LDFLAGS+=("-static")
|
||||
host_libstdcxx_flags+=("-static-libgcc")
|
||||
host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++")
|
||||
host_libstdcxx_flags+=("-lm")
|
||||
if [ "${CT_GCC_older_than_6}" = "y" ]; then
|
||||
host_libstdcxx_flags+=("-static-libgcc")
|
||||
host_libstdcxx_flags+=("-Wl,-Bstatic,-lstdc++")
|
||||
host_libstdcxx_flags+=("-lm")
|
||||
fi
|
||||
# Companion libraries are build static (eg !shared), so
|
||||
# the libstdc++ is not pulled automatically, although it
|
||||
# is needed. Shoe-horn it in our LDFLAGS
|
||||
@ -1094,7 +1098,7 @@ do_gcc_backend() {
|
||||
final_LDFLAGS+=("-lstdc++")
|
||||
final_LDFLAGS+=("-lm")
|
||||
else
|
||||
if [ "${CT_CC_GCC_STATIC_LIBSTDCXX}" = "y" ]; then
|
||||
if [ "${CT_CC_GCC_STATIC_LIBSTDCXX}" = "y" -a "${CT_GCC_older_than_6}" = "y" ]; then
|
||||
# this is from CodeSourcery arm-2010q1-202-arm-none-linux-gnueabi.src.tar.bz2
|
||||
# build script
|
||||
# INFO: if the host gcc is gcc-4.5 then presumably we could use -static-libstdc++,
|
||||
|
Loading…
Reference in New Issue
Block a user