diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-12-19 14:51:36 +1100 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2017-03-07 20:51:08 +0400 |
| commit | f2c1e06a943eb67611c78299e70515004fcf9c00 (patch) | |
| tree | b2459b2119d982c3ff7a38a9a64695812712a5eb | |
| parent | 20007c89c891511f68f85c2c985b3f8122588a55 (diff) | |
| download | mariadb-git-f2c1e06a943eb67611c78299e70515004fcf9c00.tar.gz | |
Travis: Revert to optional MYSQL_{BUILD_CC,BUILD_CXX,COMPILER_LAUNCHER}
To facilitate multiple build types in Travis, the environment variable
MYSQL_{BUILD_CC,BUILD_CXX} will be passed to cmake if used. This will
fallback to $CC/$CXX otherwise.
Added MYSQL_COMPILER_LAUNCHER (usually ccache) which isn't supported
until cmake-3.4, which isn't in travis (trusty), but hopefully a later
version can use it or in CI systems other than travis.
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
| -rwxr-xr-x | debian/rules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules index 707857a0bac..f16409b4eb4 100755 --- a/debian/rules +++ b/debian/rules @@ -84,6 +84,10 @@ endif -DCOMPILATION_COMMENT="mariadb.org binary distribution" \ -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \ -DSYSTEM_TYPE="debian-$(DEB_BUILD_GNU_SYSTEM)" \ + $${MYSQL_BUILD_CXX:+-DCMAKE_CXX_COMPILER=$${MYSQL_BUILD_CXX}} \ + $${MYSQL_BUILD_CC:+-DCMAKE_C_COMPILER=$${MYSQL_BUILD_CC}} \ + $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_CXX_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ + $${MYSQL_COMPILER_LAUNCHER:+-DCMAKE_C_COMPILER_LAUNCHER=${MYSQL_COMPILER_LAUNCHER}} \ -DCMAKE_SYSTEM_PROCESSOR=$(DEB_BUILD_ARCH) \ -DBUILD_CONFIG=mysql_release \ -DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \ |