@@ -45,10 +45,10 @@ ENV \
4545 CC_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-gcc-8 \
4646 CXX_armv7_unknown_linux_gnueabi=arm-linux-gnueabi-g++-8 \
4747 AR_x86_64_fortanix_unknown_sgx=ar \
48- CC_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx- clang-11 \
49- CFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
50- CXX_x86_64_fortanix_unknown_sgx=x86_64-fortanix-unknown-sgx- clang++-11 \
51- CXXFLAGS_x86_64_fortanix_unknown_sgx="-mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
48+ CC_x86_64_fortanix_unknown_sgx=clang-11 \
49+ CFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu - mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
50+ CXX_x86_64_fortanix_unknown_sgx=clang++-11 \
51+ CXXFLAGS_x86_64_fortanix_unknown_sgx="-D__ELF__ -isystem/usr/include/x86_64-linux-gnu - mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening" \
5252 AR_i686_unknown_freebsd=i686-unknown-freebsd11-ar \
5353 CC_i686_unknown_freebsd=i686-unknown-freebsd11-clang \
5454 CXX_i686_unknown_freebsd=i686-unknown-freebsd11-clang++ \
@@ -71,8 +71,6 @@ COPY host-x86_64/dist-various-2/build-solaris-toolchain.sh /tmp/
7171RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386
7272RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc
7373COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
74- COPY host-x86_64/dist-various-2/x86_64-fortanix-unknown-sgx-clang-wrap.sh /usr/bin/x86_64-fortanix-unknown-sgx-clang-11
75- RUN ln -s /usr/bin/x86_64-fortanix-unknown-sgx-clang-11 /usr/bin/x86_64-fortanix-unknown-sgx-clang++-11
7674RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
7775
7876COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/
0 commit comments