diff options
| author | bloodstalker <thabogre@gmail.com> | 2017-11-07 01:03:25 +0000 |
|---|---|---|
| committer | bloodstalker <thabogre@gmail.com> | 2017-11-07 01:03:25 +0000 |
| commit | 912b06b2938a9c34b582f372d57c8a1aea84f0ea (patch) | |
| tree | 091d4ed9c77206b18ccdd3931e059fe4db014102 | |
| parent | fix (diff) | |
| download | mutator-912b06b2938a9c34b582f372d57c8a1aea84f0ea.tar.gz mutator-912b06b2938a9c34b582f372d57c8a1aea84f0ea.zip | |
travis should be fixed now
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | bruiser/makefile | 4 | ||||
| -rw-r--r-- | makefile | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index a1cbc32..51214d0 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 mutator-lvl0 safercpp" + build_command: "make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG" branch_pattern: master before_install: @@ -43,9 +43,7 @@ before_script: - python3-config --ldflags script: - - make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0 BUILD_MODE=COV_NO_CLANG -j2 mutator-lvl0 safercpp - - cd bruiser && make - - cd ../daemon make + - make 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 a464371..65a5ed7 100644 --- a/bruiser/makefile +++ b/bruiser/makefile @@ -4,7 +4,7 @@ include ../macros.mk #######################################VARS#################################### override CXX_FLAGS+:=-I/usr/include -override CXX_FLAGS+:=$(shell python3-config --includes) +override CXX_FLAGS+::=$(shell python3-config --includes) BRUISER=bruiser LUA?=JIT LIB_LUA=./lua-5.3.4/src/liblua.a @@ -30,8 +30,6 @@ depend: .bruiser.d -include ./.bruiser.d .cpp.o: depend - @echo 'fuck right off' - echo 'fuck right off' $(CXX) $(CXX_FLAGS) -I/usr/include/python3.5m -c $< -o $@ linenoise.o: @@ -31,15 +31,15 @@ $(TARGET1): $(TARGET1).o mutator_aux.o $(CXX) $^ $(LD_FLAGS) -o $@ $(TARGET2): $(TARGET2).o mutator_aux.o - $(CXX) $^ $(LD_FLAGS) -o $@ + $(CXX) $^ $(LD_FLAGS) -o $@ $(TARGET0): $(TARGET0).o mutator_aux.o mutator_report.o $(CXX) $^ $(LD_FLAGS) -o $@ -$(SFCPP01): ./safercpp/$(SFCPP01).o mutator_aux.o +$(SFCPP01): $(MAKE) -C safercpp CXX=$(CXX) LLVM_CONF=$(LLVM_CONF) BUILD_MODE=$(BUILD_MODE) -$(BRUISER): ./bruiser/$(BRUISER).o mutator_aux.o +$(BRUISER): $(MAKE) -C bruiser CXX=$(CXX) LLVM_CONF=$(LLVM_CONF) BUILD_MODE=$(BUILD_MODE) $(TARGETC): |