diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 15:43:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-18 15:43:01 +0100 |
| commit | f3a800ef6edf8f2c1fa367aefbe7b6567c68a919 (patch) | |
| tree | 89df2165ed6379b35eedab7fcb4125f41027577e /scripts/mysql_config.sh | |
| parent | cc2c296309def442de0ebbe101f1fd61cb1acc0a (diff) | |
| download | mariadb-git-f3a800ef6edf8f2c1fa367aefbe7b6567c68a919.tar.gz | |
MDEV-7028 mysql_config produces invalid cflags (was: udf_example.c couldn't compile)
two bugs in mysql_config:
1. flags like -Werror=format were not stipped out
2. one-pass s/// command was used that could not remove all matching flags
(e.g. s/ A */ /g cannot remove all A's in " 1 2 A A A A A 4 5 ")
Diffstat (limited to 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index e4640961b34..57bdb4cbd56 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -136,12 +136,12 @@ cflags="$include @CFLAGS@ " #note: end space! for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_valgrind 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" AC99 \ + Xa xstrconst "xc99=none" AC99 'W[-A-Za-z]*=[-A-Za-z0-9]*' \ unroll2 ip mp restrict do # The first option we might strip will always have a space before it because # we set -I$pkgincludedir as the first option - cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` + cflags=`echo "$cflags"|sed -e ':again' -e "s/ -$remove */ /g" -e 't again'` done cflags=`echo "$cflags"|sed -e 's/ *\$//'` |