Skip to content

M
mariadb
Commit aa2a2f83 authored by unknown's avatar unknown
Browse files
Options

Buildbot VMs have cmake in /usr/local/, so we need to include that in the path.

parent cfd4fcb0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
debian/dist/Debian/rules
View file @ aa2a2f83
...@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd) ...@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
endif endif
( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \ CC=$${MYSQL_BUILD_CC:-gcc} \
CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
CXX=$${MYSQL_BUILD_CXX:-g++} \ CXX=$${MYSQL_BUILD_CXX:-g++} \
......
debian/dist/Ubuntu/rules
View file @ aa2a2f83
...@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd) ...@@ -64,7 +64,7 @@ ifneq ($(ARCH_OS),hurd)
endif endif
( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \ ( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \ sh -c 'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin:/usr/local/bin"} \
CC=$${MYSQL_BUILD_CC:-gcc} \ CC=$${MYSQL_BUILD_CC:-gcc} \
CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \ CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
CXX=$${MYSQL_BUILD_CXX:-g++} \ CXX=$${MYSQL_BUILD_CXX:-g++} \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7