diff options
| author | unknown <jimw@mysql.com> | 2005-01-06 20:01:18 +0100 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-01-06 20:01:18 +0100 |
| commit | 7261f3c01677359c1afd0d5a7c01c805cc8e3b98 (patch) | |
| tree | 3d4f207299f01a09d6720e6ac19152cb983e14fa /scripts | |
| parent | 299d0a8775090a3fa8cb43645761394097e9a088 (diff) | |
| parent | eb6f4f85f054094d9c6cfd0394d455e7c55a9c57 (diff) | |
| download | mariadb-git-7261f3c01677359c1afd0d5a7c01c805cc8e3b98.tar.gz | |
Merge mysql.com:/home/jwinstead2/mysql-4.1-6964
into mysql.com:/home/jwinstead2/mysql-4.1-clean
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 86cbe944416..3676e03ab48 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -100,7 +100,9 @@ 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"` + # 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"` done cflags=`echo "$cflags"|sed -e 's/ *\$//'` |