about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorDan Liew <daniel.liew@imperial.ac.uk>2014-09-14 13:57:38 +0100
committerDan Liew <daniel.liew@imperial.ac.uk>2014-09-14 13:57:38 +0100
commit97418c39fb279d06d5f428e46b4d3fde9a1e196b (patch)
tree1a09d333c85606b02bd24e9bd3d3c10fc7586d28
parent7c79c1c5299108e58852905182abcc7d3ba6fa40 (diff)
downloadklee-97418c39fb279d06d5f428e46b4d3fde9a1e196b.tar.gz
Remove dependence on the bc tool. Use python instead because we are
already dependent on it.
-rw-r--r--.travis.yml2
-rw-r--r--tools/klee/Makefile2
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