summaryrefslogtreecommitdiff
path: root/linux-build-farm/ubuntu-xenial/x64/Dockerfile
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-07-05 14:09:33 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-07-05 14:09:33 -0700
commitb732c445b8cac725806e23915be97a533da2d13e (patch)
tree210134dbe09616c9802ca6ccda7668c39fe60930 /linux-build-farm/ubuntu-xenial/x64/Dockerfile
parent97ec88e346b2cdaa939e9af243eaed9a54ce65f6 (diff)
downloadinfinitytier-b732c445b8cac725806e23915be97a533da2d13e.tar.gz
infinitytier-b732c445b8cac725806e23915be97a533da2d13e.zip
Xenial fix (clang broken) and bundle http-parser even in Fedora because it is so version sensitive.
Diffstat (limited to 'linux-build-farm/ubuntu-xenial/x64/Dockerfile')
-rw-r--r--linux-build-farm/ubuntu-xenial/x64/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux-build-farm/ubuntu-xenial/x64/Dockerfile b/linux-build-farm/ubuntu-xenial/x64/Dockerfile
index e169843a..03a65c55 100644
--- a/linux-build-farm/ubuntu-xenial/x64/Dockerfile
+++ b/linux-build-farm/ubuntu-xenial/x64/Dockerfile
@@ -4,7 +4,9 @@ MAINTAINER Adam Ierymenko <adam.ierymenko@zerotier.com>
RUN apt-get update
RUN apt-get install -y build-essential debhelper libhttp-parser-dev liblz4-dev libnatpmp-dev dh-systemd ruby-ronn g++ make devscripts clang-3.8
-RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
-RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+#RUN ln -sf /usr/bin/clang++-3.8 /usr/bin/clang++
+#RUN ln -sf /usr/bin/clang-3.8 /usr/bin/clang
+
+RUN rm -f /usr/bin/clang++ /usr/bin/clang
ADD zt1-src.tar.gz /