diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build/debug/300-gdb.sh | 5 | ||||
-rw-r--r-- | scripts/crosstool-NG.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 9139331..b0ea29b 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -146,7 +146,7 @@ do_debug_gdb_build() cflags="${CT_ALL_TARGET_CFLAGS}" \ ldflags="${CT_ALL_TARGET_LDFLAGS}" \ static="${CT_GDB_NATIVE_STATIC}" \ - static_libstdc="${CT_GDB_NATIVE_STATIC_LIBSTDC}" \ + static_libstdcxx="${CT_GDB_NATIVE_STATIC_LIBSTDCXX}" \ prefix=/usr \ destdir="${CT_DEBUGROOT_DIR}" \ "${native_extra_config[@]}" @@ -236,7 +236,8 @@ do_gdb_backend() cflags+=" -static" ldflags+=" -static" fi - if [ "${static_libstdc}" = "y" ]; then + if [ "${static_libstdcxx}" = "y" ]; then + ldflags+=" -static-libgcc" ldflags+=" -static-libstdc++" fi diff --git a/scripts/crosstool-NG.sh b/scripts/crosstool-NG.sh index 14be5ed..f09ae0c 100644 --- a/scripts/crosstool-NG.sh +++ b/scripts/crosstool-NG.sh @@ -437,7 +437,7 @@ if [ -z "${CT_RESTART}" ]; then t="${!r}-" fi - for tool in ar as dlltool gcc g++ gcj gnatbind gnatmake ld nm objcopy objdump ranlib strip windres; do + for tool in ar as dlltool gcc g++ gcj gnatbind gnatmake ld libtool nm objcopy objdump ranlib strip windres; do # First try with prefix + suffix # Then try with prefix only # Then try with suffix only, but only for BUILD, and HOST iff REAL_BUILD == REAL_HOST |