summaryrefslogtreecommitdiff
path: root/scripts/mysql_config.sh
diff options
context:
space:
mode:
authorunknown <tnurnberg@mysql.com/white.intern.koehntopp.de>2008-02-25 07:50:55 +0100
committerunknown <tnurnberg@mysql.com/white.intern.koehntopp.de>2008-02-25 07:50:55 +0100
commit1eb99d3fd4e57580b8fd87f630f69370d5766b07 (patch)
treedd1246c962fe503cbabdf7fd30bf92bbcdc1fc97 /scripts/mysql_config.sh
parent012aab7d8bf7ae9c30751a6d5f666c7731ecfdf3 (diff)
downloadmariadb-git-1eb99d3fd4e57580b8fd87f630f69370d5766b07.tar.gz
Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX C++ compiler into C-mode; as a result, C++ sources could not be compiled correctly. We now filter out the offending flag (like we do for Sun) so that --cflags will work for both C and C++. scripts/mysql_config.sh: Add -AC99 (for HP/UX) to the list of flags we need to remove from "mysql_config --cflags" so they work for C and C++ both.
Diffstat (limited to 'scripts/mysql_config.sh')
-rw-r--r--scripts/mysql_config.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index ae58655ed0f..a0c3b43d690 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -113,10 +113,12 @@ include="-I$pkgincludedir"
# Remove some options that a client doesn't have to care about
# FIXME until we have a --cxxflags, we need to remove -Xa
# and -xstrconst to make --cflags usable for Sun Forte C++
+# FIXME until we have a --cxxflags, we need to remove -AC99
+# to make --cflags usable for HP C++ (aCC)
for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \
DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
- Xa xstrconst "xc99=none" \
+ Xa xstrconst "xc99=none" AC99 \
unroll2 ip mp restrict
do
# The first option we might strip will always have a space before it because