summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorkaa@kaamos.(none) <>2008-03-12 11:19:46 +0300
committerkaa@kaamos.(none) <>2008-03-12 11:19:46 +0300
commit0a7052e4d3633b818ab4050adcad646b888c5430 (patch)
treef84e4ada799bf37a3d9ef074064f8a17f408aa89 /scripts
parentd4025ce1a60322635bf5f7adb765f4612563ee3a (diff)
parent7e365efa30f5d42aaf87ce9044176e266ee337eb (diff)
downloadmariadb-git-0a7052e4d3633b818ab4050adcad646b888c5430.tar.gz
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
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 8abad75bc2a..915f623578d 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -123,11 +123,13 @@ 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]*' \
'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
- 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