diff options
| author | tsmith@siva.hindu.god <> | 2007-01-18 08:30:35 -0700 |
|---|---|---|
| committer | tsmith@siva.hindu.god <> | 2007-01-18 08:30:35 -0700 |
| commit | cc7afe24947a687df41f757c2014ac6e90897710 (patch) | |
| tree | 43ed4a13aa6f4077a05dacedc68e38e0ace6b8be /BUILD | |
| parent | 230b1919512f6e5dcc15ecd765dc4f1d914acc50 (diff) | |
| parent | f2d4988c37afa398cd73b087bc3274f175c4f5b3 (diff) | |
| download | mariadb-git-cc7afe24947a687df41f757c2014ac6e90897710.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 2 | ||||
| -rwxr-xr-x | BUILD/check-cpu | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index dfbf1547517..1f62ffe7c26 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -183,7 +183,7 @@ fi # (http://samba.org/ccache) is installed, use it. # We use 'grep' and hope 'grep' will work as expected # (returns 0 if finds lines) -if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" == "1" +if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1" then echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC" echo "$CXX" | grep "ccache" > /dev/null || CXX="ccache $CXX" diff --git a/BUILD/check-cpu b/BUILD/check-cpu index b4f5fd41b06..042e6b9856d 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -28,7 +28,7 @@ check_cpu () { fi # parse CPU flags - for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //'`; do + for flag in `$cpuinfo | grep '^flags' | sed -e 's/^flags.*: //' -e 's/[^a-zA-Z0-9_ ]/_/g'`; do eval cpu_flag_$flag=yes done else |