diff options
| author | bloodstalker <thabogre@gmail.com> | 2017-11-07 02:51:10 +0000 |
|---|---|---|
| committer | bloodstalker <thabogre@gmail.com> | 2017-11-07 02:51:10 +0000 |
| commit | 2e96d67cf0f2596a0208bc8fc002a118742b30ec (patch) | |
| tree | 283d0ced8401111ccdd82cbfc61bb287b2c8c3dc | |
| parent | fix (diff) | |
| download | mutator-2e96d67cf0f2596a0208bc8fc002a118742b30ec.tar.gz mutator-2e96d67cf0f2596a0208bc8fc002a118742b30ec.zip | |
fix
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | bruiser/makefile | 4 | ||||
| -rw-r--r-- | macros.mk | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 39ddcd8..c06541a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: description: "Build submitted via Travis CI" notification_email: thabogre@gmail.com build_command_prepend: "cov-configure --comptype clangcxx --compiler clang-5.0" - build_command: "make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG" + build_command: "make PY_CONF=python3.5-config CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG" branch_pattern: master before_install: @@ -45,7 +45,7 @@ before_script: - python3-config --ldflags script: - - make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG -j2 + - make PY_CONF=python3.5-config CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG -j2 after_failure: - find . -maxdepth 1 -name "core*" diff --git a/bruiser/makefile b/bruiser/makefile index 3544416..680d314 100644 --- a/bruiser/makefile +++ b/bruiser/makefile @@ -4,7 +4,7 @@ include ../macros.mk #######################################VARS#################################### CXX_FLAGS+=-I/usr/include -CXX_FLAGS+=$(shell python3-config --includes) +CXX_FLAGS+=$(shell $(PY_CONF) --includes) BRUISER=bruiser LUA?=JIT LIB_LUA=./lua-5.3.4/src/liblua.a @@ -13,7 +13,7 @@ HEADER_LIST=bruiser.h bruiser-extra.h CompletionHints.h SRCS=bruiser.cpp, CompletionHints.cpp, ORCmutation.cpp, mutagen.cpp #for some reason without ld the build fails on ubuntu trusty on travis #EXTRA_LD_FLAGS+=-lpthread -ldl -lutil -lm -Xlinker -lpython3 -EXTRA_LD_FLAGS+=$(shell python3-config --ldflags) +EXTRA_LD_FLAGS+=$(shell $(PY_CONF) --ldflags) ######################################RULES#################################### .DEFAULT: all @@ -1,6 +1,7 @@ #MACRO DEFINITIONS FOR MUTATOR BUILDS CXX=clang++ +PY_CONF?=python3-config CXX?=clang++ CC?=clang LLVM_CONF?=llvm-config |