diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-19 17:23:39 +0100 |
| commit | 3495801e2e94df5a10cae6e056f65defa038a6b6 (patch) | |
| tree | de524b4bf45dbc19a95262843f2b72d0f5adb7bc /scripts/mysql_config.sh | |
| parent | df7b27f1fe308fd4011fa020bebd7c69bcd43383 (diff) | |
| parent | 496fda66fdc34b447ef4dec26d1250b034a321e3 (diff) | |
| download | mariadb-git-3495801e2e94df5a10cae6e056f65defa038a6b6.tar.gz | |
5.5 merge
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 4909d5d0a87..47010ac087b 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/ *\$//'` |