Fix for a debian build failure (cherry-picked

from 10.0:r4231).
MariaDB · Jun 9, 2014 · 2357871 · 2357871
1 parent cc66ae6
commit 2357871
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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++} \