diff options
| author | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2008-02-25 07:50:55 +0100 |
|---|---|---|
| committer | tnurnberg@mysql.com/white.intern.koehntopp.de <> | 2008-02-25 07:50:55 +0100 |
| commit | 874e919872047d000207d7651c64380ae4df7221 (patch) | |
| tree | dd1246c962fe503cbabdf7fd30bf92bbcdc1fc97 /scripts | |
| parent | 0a29b8b08520070950186ae64ff058b3fba3c1cb (diff) | |
| download | mariadb-git-874e919872047d000207d7651c64380ae4df7221.tar.gz | |
Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX
C++ compiler into C-mode; as a result, C++ sources could
not be compiled correctly.
We now filter out the offending flag (like we do for Sun)
so that --cflags will work for both C and C++.
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 |