Browse code

Use clang 3.5 over 3.8

the llvm apt repo was removed and finding the exact rev of the llvm
toolchain that worked perfecting in our dockerfile is a problem.

We looked at the reasons why we were using this version of clang and it
appears to be this compiler warning.

`was built for newer OSX version (10.11) than being linked
(10.6)`

When you look at the dockerfile this makes sense.

```
ENV OSX_SDK MacOSX10.11.sdk
ENV OSX_CROSS_COMMIT 8aa9b71a394905e6c5f4b59e2b97b87a004658a4
RUN set -x \
&& export OSXCROSS_PATH="/osxcross" \
&& git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \
&& ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \
&& curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \
&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
ENV PATH /osxcross/target/bin:$PATH
```

We are basically using the 10.11 sdk but linking to 10.6 as the
min version so this warning should be expected.

Also the docs on the osxcross project require clan 3.2+, not 3.8.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2016/06/01 08:45:42
Showing 1 changed files
... ...
@@ -30,10 +30,6 @@ RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E87
30 30
 	|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
31 31
 RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
32 32
 
33
-# add llvm repo
34
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421 \
35
-	|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
36
-RUN echo deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main > /etc/apt/sources.list.d/llvm.list
37 33
 
38 34
 # allow replacing httpredir mirror
39 35
 ARG APT_MIRROR=httpredir.debian.org
... ...
@@ -50,7 +46,7 @@ RUN apt-get update && apt-get install -y \
50 50
 	bsdmainutils \
51 51
 	btrfs-tools \
52 52
 	build-essential \
53
-	clang-3.8 \
53
+	clang \
54 54
 	createrepo \
55 55
 	curl \
56 56
 	dpkg-sig \
... ...
@@ -77,10 +73,7 @@ RUN apt-get update && apt-get install -y \
77 77
 	tar \
78 78
 	zip \
79 79
 	--no-install-recommends \
80
-	&& pip install awscli==1.10.15 \
81
-	&& ln -snf /usr/bin/clang-3.8 /usr/local/bin/clang \
82
-	&& ln -snf /usr/bin/clang++-3.8 /usr/local/bin/clang++
83
-
80
+	&& pip install awscli==1.10.15
84 81
 # Get lvm2 source for compiling statically
85 82
 ENV LVM2_VERSION 2.02.103
86 83
 RUN mkdir -p /usr/local/lvm2 \