diff options
| author | unknown <jimw@mysql.com> | 2005-01-05 03:43:37 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-05 03:43:37 +0100 |
| commit | 329a6e9c2225096ac7301204cec828d38f30e4a6 (patch) | |
| tree | b2d7a78555687f36176bac2866ab68f271705f01 /scripts | |
| parent | 55ace5fd44953f7751452fd4c2e9ed79a4bace44 (diff) | |
| download | mariadb-git-329a6e9c2225096ac7301204cec828d38f30e4a6.tar.gz | |
Protect flags like -Wl,-O2 from being mangled by mysql_config (Bug #6964)
(Second commit of this patch -- first included wrong changes.)
scripts/mysql_config.sh:
Make sure we are only removing whole options (protects -Wl,-O2, for example)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 86cbe944416..35ddbcac471 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -100,7 +100,7 @@ for remove in DDBUG_OFF DSAFEMALLOC USAFEMALLOC DSAFE_MUTEX \ DPEDANTIC_SAFEMALLOC DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify 'O[0-9]' 'W[-A-Za-z]*' do - cflags=`echo "$cflags"|sed -e "s/-$remove *//g"` + cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` done cflags=`echo "$cflags"|sed -e 's/ *\$//'` |