summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2004-02-12 15:53:47 +0100
committerunknown <lenz@mysql.com>2004-02-12 15:53:47 +0100
commit96634253b7c4b8c6649f14f24b4786ac1996a40f (patch)
treeb6fa040a59c21aace1e1edaee9a44dbd1d27da44 /support-files
parent65ec6a41b65f26552481be24ac8947c83eeea198 (diff)
downloadmariadb-git-96634253b7c4b8c6649f14f24b4786ac1996a40f.tar.gz
- always use CXX=gcc (not only when using gcc 3) to avoid a dependency
on libstdc++ and exceptions
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 3ee602e7504..b69d6961f37 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -258,10 +258,11 @@ export PATH
# Build the 4.0 Max binary (includes BDB and UDFs and therefore
# cannot be linked statically against the patched glibc)
-# If we want to compile with RAID using gcc 3, we need to use
-# gcc instead of g++ to avoid linking problems (RAID code is written in C++)
-test -z $CXX && test -z $CC && if gcc -v 2>&1 | grep 'gcc version 3' > /dev/null 2>&1
+# Use gcc for C and C++ code (to avoid a dependency on libstdc++ and
+# including exceptions into the code
+test -z $CXX && test -z $CC
then
+ export CC="gcc"
export CXX="gcc"
fi
@@ -573,6 +574,10 @@ fi
# The spec file changelog only includes changes made to the spec file
# itself
%changelog
+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
+
+- when using gcc, _always_ use CXX=gcc
+
* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
- added myisam_ftdump to the Server package