aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-03-17 16:02:51 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-03-17 16:02:51 -0700
commita4134159ab7a6084ff7692d6dfb744428c0df958 (patch)
tree34df8037f0727151b590c40cae4b2d9994ff6915 /templates/tools/dockerfile
parenta09af92d232354ebdb72e0ca9aac485584851c88 (diff)
j
Diffstat (limited to 'templates/tools/dockerfile')
-rw-r--r--templates/tools/dockerfile/clang_update.include2
-rw-r--r--templates/tools/dockerfile/test/fuzzers.template5
2 files changed, 2 insertions, 5 deletions
diff --git a/templates/tools/dockerfile/clang_update.include b/templates/tools/dockerfile/clang_update.include
index 83ab3e0bbb..a44fe717d8 100644
--- a/templates/tools/dockerfile/clang_update.include
+++ b/templates/tools/dockerfile/clang_update.include
@@ -29,4 +29,4 @@ RUN cd llvm-build && cmake ${'\\'}
-DCMAKE_INSTALL_PREFIX:STRING=/usr ${'\\'}
-DLLVM_TARGETS_TO_BUILD:STRING=X86 ${'\\'}
../llvm
-RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build
+RUN make -C llvm-build -j 12 && make -C llvm-build install && rm -rf llvm-build
diff --git a/templates/tools/dockerfile/test/fuzzers.template b/templates/tools/dockerfile/test/fuzzers.template
index 763a6169ea..6cf8694f3b 100644
--- a/templates/tools/dockerfile/test/fuzzers.template
+++ b/templates/tools/dockerfile/test/fuzzers.template
@@ -37,11 +37,8 @@ template: |
<%include file="../apt_get_basic.include"/>
<%include file="../cxx_deps.include"/>
+ <%include file="../clang_update.include"/>
<%include file="../run_tests_addons.include"/>
- RUN git clone -n -b master http://llvm.org/git/llvm.git && ${'\\'}
- cd llvm && ${'\\'}
- git checkout 308857f && ${'\\'}
- cd ..
RUN clang++ -c -g -O2 -std=c++11 llvm/lib/Fuzzer/*.cpp -IFuzzer
RUN ar ruv libFuzzer.a Fuzzer*.o
RUN mv libFuzzer.a /usr/lib