Point clang at gcc6.2

etc/config/c++.amazon.properties

@@ -48,30 +48,38 @@ compiler.g7snapshot.name=x86-64 gcc 7 (snapshot)
 compiler.clang350.exe=/usr/bin/clang++-3.5
 compiler.clang350.name=x86-64 clang 3.5
 compiler.clang350.intelAsm=-masm=intel
+compiler.clang350.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang351.exe=/opt/gcc-explorer/clang+llvm-3.5.1-x86_64-linux-gnu/bin/clang++
 compiler.clang351.name=x86-64 clang 3.5.1
 compiler.clang351.intelAsm=-masm=intel
+compiler.clang351.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang352.exe=/opt/gcc-explorer/clang+llvm-3.5.2-x86_64-linux-gnu/bin/clang++
 compiler.clang352.name=x86-64 clang 3.5.2
 compiler.clang352.intelAsm=-masm=intel
+compiler.clang352.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang36x.exe=/opt/gcc-explorer/clang+llvm-3.6.2-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
 compiler.clang36x.name=x86-64 clang 3.6
 compiler.clang36x.intelAsm=-masm=intel
+compiler.clang36x.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang37x.exe=/opt/gcc-explorer/clang+llvm-3.7.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
 compiler.clang37x.name=x86-64 clang 3.7
 compiler.clang37x.intelAsm=-masm=intel
+compiler.clang37x.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang371.exe=/opt/gcc-explorer/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
 compiler.clang371.name=x86-64 clang 3.7.1
 compiler.clang371.intelAsm=-masm=intel
+compiler.clang371.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang380.exe=/opt/gcc-explorer/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
 compiler.clang380.name=x86-64 clang 3.8
 compiler.clang380.intelAsm=-masm=intel
+compiler.clang380.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang381.exe=/opt/gcc-explorer/clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++
 compiler.clang381.name=x86-64 clang 3.8.1
 compiler.clang381.intelAsm=-masm=intel
 compiler.clang390.exe=/opt/gcc-explorer/clang+llvm-3.9.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++
 compiler.clang390.name=x86-64 clang 3.9.0
 compiler.clang390.intelAsm=-masm=intel
+compiler.clang390.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.icc16.exe=/opt/gcc-explorer/intel/xe_2016_update3/bin/icc
 compiler.icc16.name=x86-64 icc 16
 compiler.icc16.intelAsm=-masm=intel

etc/config/c++.amazon1204.properties

@@ -25,18 +25,22 @@ compiler.clang30.exe=/usr/bin/clang++
 compiler.clang30.alias=/usr/bin/clang++
 compiler.clang30.name=x86-64 clang 3.0
 compiler.clang30.intelAsm=-mllvm --x86-asm-syntax=intel
+compiler.clang30.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang32.exe=/opt/gcc-explorer/clang-3.2/bin/clang++
 compiler.clang32.alias=/opt/clang-3.2/bin/clang++
 compiler.clang32.name=x86-64 clang 3.2
 compiler.clang32.intelAsm=-mllvm --x86-asm-syntax=intel
+compiler.clang32.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang33.exe=/opt/gcc-explorer/clang-3.3/bin/clang++
 compiler.clang33.alias=/opt/clang-3.3/bin/clang++
 compiler.clang33.name=x86-64 clang 3.3
 compiler.clang33.intelAsm=-mllvm --x86-asm-syntax=intel
+compiler.clang33.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 compiler.clang341.exe=/opt/gcc-explorer/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04/bin/clang++
 compiler.clang341.alias=/opt/clang+llvm-3.4.1-x86_64-unknown-ubuntu12.04/bin/clang++
 compiler.clang341.name=x86-64 clang 3.4.1
 compiler.clang341.intelAsm=-mllvm --x86-asm-syntax=intel
+compiler.clang341.options=--gcc-toolchain=/opt/gcc-explorer/gcc-6.2.0
 
 ###############################
 # GCC for ARM