Skip to content

Commit 201893f

Browse files
authored
Rollup merge of #83204 - jethrogb:jb/sgx-c-build, r=joshtriplett,raoulstrackx
Simplify C compilation for Fortanix-SGX target cc ``@raoulstrackx``
2 parents 1e23ab5 + 5bd50ef commit 201893f

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

Diff for: src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+4-6
Original file line numberDiff line numberDiff line change
@@ -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/
7171
RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386
7272
RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc
7373
COPY 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
7674
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
7775

7876
COPY host-x86_64/dist-various-2/build-wasi-toolchain.sh /tmp/

Diff for: src/ci/docker/host-x86_64/dist-various-2/x86_64-fortanix-unknown-sgx-clang-wrap.sh

-14
This file was deleted.

0 commit comments

Comments
 (0)