diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 06:44:31 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2008-03-10 06:44:31 +0100 |
| commit | 230c7a4cc1eee506766d09a6f1be2b3365ae51f1 (patch) | |
| tree | b166588a49c1b0ecd54cafb8a262989ca255b04e /scripts | |
| parent | 9bd3b8545a44188502a1a142e6f2171ac5b600e1 (diff) | |
| parent | 1eb99d3fd4e57580b8fd87f630f69370d5766b07 (diff) | |
| download | mariadb-git-230c7a4cc1eee506766d09a6f1be2b3365ae51f1.tar.gz | |
Merge mysql.com:/misc/mysql/29645/50-29645
into mysql.com:/misc/mysql/29645/51-29645
scripts/mysql_config.sh:
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 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 |