summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authortnurnberg@white.intern.koehntopp.de <>2008-03-10 06:52:32 +0100
committertnurnberg@white.intern.koehntopp.de <>2008-03-10 06:52:32 +0100
commit10bf47abf3a1234ab1fa1114eb517018f3dc953d (patch)
tree5ef7f481bf89db8691ffefdcb7864c417c5676af /scripts
parent71d67f7f510576b789fda3954560b6ca6329261f (diff)
parent6ad2340f6382610bd82d68e2a942f08e6a433d84 (diff)
downloadmariadb-git-10bf47abf3a1234ab1fa1114eb517018f3dc953d.tar.gz
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/29645/51-29645
Diffstat (limited to 'scripts')
-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