From 97418c39fb279d06d5f428e46b4d3fde9a1e196b Mon Sep 17 00:00:00 2001 From: Dan Liew Date: Sun, 14 Sep 2014 13:57:38 +0100 Subject: Remove dependence on the bc tool. Use python instead because we are already dependent on it. --- .travis.yml | 2 -- tools/klee/Makefile | 2 +- 2 files changed, 1 insertion(+), 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 -- cgit 1.4.1