diff options
| author | unknown <joerg@trift2.> | 2008-03-14 14:32:01 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-03-14 14:32:01 +0100 |
| commit | ed86d34b6d4f518807b6deacf03d6992abee5099 (patch) | |
| tree | 61578e5a77309a730b90cace8e461e0a3223bb26 /scripts | |
| parent | 51f198447beb8e656b542f3a356e0093591f5b72 (diff) | |
| parent | f20fe94b55727fbc69b1cb86af5dc96f216bdd87 (diff) | |
| download | mariadb-git-ed86d34b6d4f518807b6deacf03d6992abee5099.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
client/mysqldump.c:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_config.sh | 4 |
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 |