diff options
author | Daniel Dunbar <daniel@zuster.org> | 2014-09-14 09:47:29 -0700 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2014-09-14 09:47:29 -0700 |
commit | 7bb4d4463c66b8cac584d917f2def7d7940c1bf6 (patch) | |
tree | 0a8e91e2a81d6a2bc7d0af3bdd0d08ffa08cef34 | |
parent | a2c2e4485bbdbf4bc88755c0b1e0e0477473915a (diff) | |
parent | 97418c39fb279d06d5f428e46b4d3fde9a1e196b (diff) | |
download | klee-7bb4d4463c66b8cac584d917f2def7d7940c1bf6.tar.gz |
Merge branch 'remove_bc_dependency' of https://github.com/delcypher/klee
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | tools/klee/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 2465fba8..2675e3a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,8 +55,6 @@ before_install: - sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.4 20 # Install lit (llvm-lit is not available) - sudo pip install lit - # Gross! tools/klee/Makefile depends on "bc" - - sudo apt-get install bc # Setup out of source build - export KLEE_SRC=`pwd` - cd ../ diff --git a/tools/klee/Makefile b/tools/klee/Makefile index e526f2a2..03b387c0 100644 --- a/tools/klee/Makefile +++ b/tools/klee/Makefile @@ -15,7 +15,7 @@ include $(LEVEL)/Makefile.config USEDLIBS = kleeCore.a kleeBasic.a kleeModule.a kleaverSolver.a kleaverExpr.a kleeSupport.a LINK_COMPONENTS = jit bitreader bitwriter ipo linker engine -ifeq ($(shell echo "$(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) >= 3.3" | bc), 1) +ifeq ($(shell python -c "print($(LLVM_VERSION_MAJOR).$(LLVM_VERSION_MINOR) >= 3.3)"), True) LINK_COMPONENTS += irreader endif include $(LEVEL)/Makefile.common |