diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-31 10:17:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-31 10:17:03 +0200 |
| commit | 7f110d15b1b8e0a3eea8d1237e555476e7cc8d03 (patch) | |
| tree | 07a54cdf4fdada092ed1c8e489d166b7c3621533 /BUILD/compile-bintar | |
| parent | 515c2db0304fcf3b88cf6017ec36579ba5447108 (diff) | |
| parent | dec8b0254c01cc4a01f8a9af28a74fa8e8463b87 (diff) | |
| download | mariadb-git-7f110d15b1b8e0a3eea8d1237e555476e7cc8d03.tar.gz | |
Merge OQGraph into MariaDB 5.2.
(and in the process, fix compile-bintar to link C++ with g++ rather than gcc).
Diffstat (limited to 'BUILD/compile-bintar')
| -rwxr-xr-x | BUILD/compile-bintar | 6 |
1 files changed, 2 insertions, 4 deletions
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 \ |