diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-09 16:13:30 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-09 16:13:30 -0400 |
| commit | 2357871a213b33417539f14e6c786a3d4b74d7f6 (patch) | |
| tree | 1054335eeb4d5fc55381b66c8bc3e099c8854164 | |
| parent | cc66ae6aae4e3e5f121f1b6840213bdc525b609d (diff) | |
| download | mariadb-git-mariadb-galera-10.0.11.tar.gz | |
Fix for a debian build failure (cherry-pickedmariadb-galera-10.0.11
from 10.0:r4231).
| -rwxr-xr-x | debian/dist/Debian/rules | 2 | ||||
| -rwxr-xr-x | debian/dist/Ubuntu/rules | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules index 07487df66fb..a0923c83b54 100755 --- a/debian/dist/Debian/rules +++ b/debian/dist/Debian/rules @@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd) endif ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ - sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \ + sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ CC=$${MYSQL_BUILD_CC:-gcc} \ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized $$(case `lsb_release -sc` in (lenny) echo -DWORKAROUND_GCC_4_3_2_BUG ;; esac)"} \ CXX=$${MYSQL_BUILD_CXX:-g++} \ diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules index ce4492e8a97..ae89db84f48 100755 --- a/debian/dist/Ubuntu/rules +++ b/debian/dist/Ubuntu/rules @@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd) endif ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ - sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \ + sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/usr/local/bin:/usr/bin:/bin"} \ CC=$${MYSQL_BUILD_CC:-gcc} \ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ CXX=$${MYSQL_BUILD_CXX:-g++} \ |