summaryrefslogtreecommitdiff
path: root/scripts/mysql_config.sh
diff options
context:
space:
mode:
authorjoerg@trift2. <>2008-03-14 14:41:08 +0100
committerjoerg@trift2. <>2008-03-14 14:41:08 +0100
commite784898959463e10f738b402f2294e3ab306effd (patch)
tree746b5fc46e851c97ebe023c635c68b475addab48 /scripts/mysql_config.sh
parent8c1ba819be234b466f857e1b6d087df33df11d37 (diff)
parenteac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff)
downloadmariadb-git-e784898959463e10f738b402f2294e3ab306effd.tar.gz
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
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 4775b8820c1..c16d9bb62e5 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -125,11 +125,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