diff options
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-bintar | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 2b3630217d4..f38ecf6d8b9 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -204,7 +204,7 @@ if test -z "$CC" ; then fi if test -z "$CXX" ; then - CXX=gcc + CXX=g++ fi # If ccache (a compiler cache which reduces build time) diff --git a/BUILD/compile-bintar b/BUILD/compile-bintar index 8777cfb2670..2b039e439c0 100755 --- a/BUILD/compile-bintar +++ b/BUILD/compile-bintar @@ -32,8 +32,7 @@ # .so files at runtime (either system stuff like NSS, or server # plugins). # -# We link libgcc statically (and avoid linking libstdc++ at all by -# CXX=gcc), to avoid reduce nasty library version dependencies. +# We link libgcc statically to avoid reduce nasty library version dependencies. test -f Makefile && make distclean @@ -52,13 +51,12 @@ get_cpuopt get_make_parallel_flag # Use gcc rather than g++ to avoid linking libstdc++.so (which we don't need). -COMP="gcc -static-libgcc" FLAGS="-O2 -fno-omit-frame-pointer -g -pipe -Wall $CPUOPT" # Don't press on in case of error. set -e -CC="$COMP" CXX="$COMP" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \ +CC="gcc -static-libgcc" CXX="g++ -static-libgcc" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" \ ./configure \ --prefix=/usr/local/mysql \ --exec-prefix=/usr/local/mysql \ |