1.1 --- a/common/autoconf/generated-configure.sh Wed Nov 14 10:05:49 2012 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Nov 14 10:13:28 2012 -0800
1.3 @@ -1035,7 +1035,7 @@
1.4 with_alsa_include
1.5 with_alsa_lib
1.6 with_zlib
1.7 -enable_static_link_stdc++
1.8 +with_stdc++lib
1.9 with_num_cores
1.10 with_memory_size
1.11 with_sjavac_server_java
1.12 @@ -1712,9 +1712,6 @@
1.13 --disable-macosx-runtime-support
1.14 disable the use of MacOSX Java runtime support
1.15 framework [enabled]
1.16 - --disable-static-link-stdc++
1.17 - disable static linking of the C++ runtime on Linux
1.18 - [enabled]
1.19 --enable-sjavac use sjavac to do fast incremental compiles
1.20 [disabled]
1.21 --disable-precompiled-headers
1.22 @@ -1796,6 +1793,10 @@
1.23 --with-alsa-lib specify directory for the alsa library
1.24 --with-zlib use zlib from build system or OpenJDK source
1.25 (system, bundled) [bundled]
1.26 + --with-stdc++lib=<static>,<dynamic>,<default>
1.27 + force linking of the C++ runtime on Linux to either
1.28 + static or dynamic, default is static with dynamic as
1.29 + fallback
1.30 --with-num-cores number of cores in the build system, e.g.
1.31 --with-num-cores=8 [probed]
1.32 --with-memory-size memory (in MB) available in the build system, e.g.
1.33 @@ -3067,7 +3068,7 @@
1.34 #CUSTOM_AUTOCONF_INCLUDE
1.35
1.36 # Do not change or remove the following line, it is needed for consistency checks:
1.37 -DATE_WHEN_GENERATED=1352751880
1.38 +DATE_WHEN_GENERATED=1352916731
1.39
1.40 ###############################################################################
1.41 #
1.42 @@ -33006,12 +33007,19 @@
1.43 # statically link libstdc++ before C++ ABI is stablized on Linux unless
1.44 # dynamic build is configured on command line.
1.45 #
1.46 -# Check whether --enable-static-link-stdc++ was given.
1.47 -if test "${enable_static_link_stdc+++set}" = set; then
1.48 - enableval=$enable_static_link_stdc++;
1.49 -else
1.50 -
1.51 - enable_static_link_stdc__=yes
1.52 +
1.53 +# Check whether --with-stdc++lib was given.
1.54 +if test "${with_stdc++lib+set}" = set; then
1.55 + withval=$with_stdc++lib;
1.56 + if test "x$with_stdc__lib" != xdynamic && test "x$with_stdc__lib" != xstatic \
1.57 + && test "x$with_stdc__lib" != xdefault; then
1.58 + { { $as_echo "$as_me:$LINENO: error: Bad parameter value --with-stdc++lib=$with_stdc__lib!" >&5
1.59 +$as_echo "$as_me: error: Bad parameter value --with-stdc++lib=$with_stdc__lib!" >&2;}
1.60 + { (exit 1); exit 1; }; }
1.61 + fi
1.62 +
1.63 +else
1.64 + with_stdc__lib=default
1.65
1.66 fi
1.67
1.68 @@ -33157,38 +33165,40 @@
1.69 { $as_echo "$as_me:$LINENO: result: $has_static_libstdcxx" >&5
1.70 $as_echo "$has_static_libstdcxx" >&6; }
1.71
1.72 - if test "x$has_static_libcxx" = xno && test "x$has_dynamic_libcxx" = xno; then
1.73 - { { $as_echo "$as_me:$LINENO: error: I cannot link to stdc++! Neither dynamically nor statically." >&5
1.74 -$as_echo "$as_me: error: I cannot link to stdc++! Neither dynamically nor statically." >&2;}
1.75 - { (exit 1); exit 1; }; }
1.76 - fi
1.77 -
1.78 - if test "x$enable_static_link_stdc__" = xyes && test "x$has_static_libstdcxx" = xno; then
1.79 - { $as_echo "$as_me:$LINENO: Static linking of libstdc++ was not possible reverting to dynamic linking." >&5
1.80 -$as_echo "$as_me: Static linking of libstdc++ was not possible reverting to dynamic linking." >&6;}
1.81 - enable_static_link_stdc__=no
1.82 - fi
1.83 -
1.84 - if test "x$enable_static_link_stdc__" = xno && test "x$has_dynamic_libstdcxx" = xno; then
1.85 - { $as_echo "$as_me:$LINENO: Dynamic linking of libstdc++ was not possible reverting to static linking." >&5
1.86 -$as_echo "$as_me: Dynamic linking of libstdc++ was not possible reverting to static linking." >&6;}
1.87 - enable_static_link_stdc__=yes
1.88 + if test "x$has_static_libstdcxx" = xno && test "x$has_dynamic_libstdcxx" = xno; then
1.89 + { { $as_echo "$as_me:$LINENO: error: Cannot link to stdc++, neither dynamically nor statically!" >&5
1.90 +$as_echo "$as_me: error: Cannot link to stdc++, neither dynamically nor statically!" >&2;}
1.91 + { (exit 1); exit 1; }; }
1.92 + fi
1.93 +
1.94 + if test "x$with_stdc__lib" = xstatic && test "x$has_static_libstdcxx" = xno; then
1.95 + { { $as_echo "$as_me:$LINENO: error: Static linking of libstdc++ was not possible!" >&5
1.96 +$as_echo "$as_me: error: Static linking of libstdc++ was not possible!" >&2;}
1.97 + { (exit 1); exit 1; }; }
1.98 + fi
1.99 +
1.100 + if test "x$with_stdc__lib" = xdynamic && test "x$has_dynamic_libstdcxx" = xno; then
1.101 + { { $as_echo "$as_me:$LINENO: error: Dynamic linking of libstdc++ was not possible!" >&5
1.102 +$as_echo "$as_me: error: Dynamic linking of libstdc++ was not possible!" >&2;}
1.103 + { (exit 1); exit 1; }; }
1.104 fi
1.105
1.106 { $as_echo "$as_me:$LINENO: checking how to link with libstdc++" >&5
1.107 $as_echo_n "checking how to link with libstdc++... " >&6; }
1.108 - if test "x$enable_static_link_stdc__" = xyes; then
1.109 + # If dynamic was requested, it's available since it would fail above otherwise.
1.110 + # If dynamic wasn't requested, go with static unless it isn't available.
1.111 + if test "x$with_stdc__lib" = xdynamic || test "x$has_static_libstdcxx" = xno; then
1.112 + LIBCXX="$LIBCXX -lstdc++"
1.113 + LDCXX="$CXX"
1.114 + STATIC_CXX_SETTING="STATIC_CXX=false"
1.115 + { $as_echo "$as_me:$LINENO: result: dynamic" >&5
1.116 +$as_echo "dynamic" >&6; }
1.117 + else
1.118 LIBCXX="$LIBCXX $STATIC_STDCXX_FLAGS"
1.119 LDCXX="$CC"
1.120 STATIC_CXX_SETTING="STATIC_CXX=true"
1.121 { $as_echo "$as_me:$LINENO: result: static" >&5
1.122 $as_echo "static" >&6; }
1.123 - else
1.124 - LIBCXX="$LIBCXX -lstdc++"
1.125 - LDCXX="$CXX"
1.126 - STATIC_CXX_SETTING="STATIC_CXX=false"
1.127 - { $as_echo "$as_me:$LINENO: result: dynamic" >&5
1.128 -$as_echo "dynamic" >&6; }
1.129 fi
1.130 fi
1.131
