Add CFGuard options to build scripts (disabled by default)
This commit is contained in:
1 parent
0af177bf4f
commit
e9401c8bfe
10 files changed
+122
-34
No files matched your search
+8
-6
@@ -67,24 +67,26 @@ RUN ./install-wrappers.sh $TOOLCHAIN_PREFIX
|
||||
|
||||
ARG DEFAULT_CRT=ucrt
|
||||
|
||||
ARG CFGUARD_ARGS=--disable-cfguard
|
||||
|
||||
# Build MinGW-w64
|
||||
COPY build-mingw-w64.sh ./
|
||||
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT
|
||||
RUN ./build-mingw-w64.sh $TOOLCHAIN_PREFIX --with-default-msvcrt=$DEFAULT_CRT $CFGUARD_ARGS
|
||||
|
||||
COPY build-mingw-w64-tools.sh ./
|
||||
RUN ./build-mingw-w64-tools.sh $TOOLCHAIN_PREFIX
|
||||
|
||||
# Build compiler-rt
|
||||
COPY build-compiler-rt.sh ./
|
||||
RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX
|
||||
RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
|
||||
|
||||
# Build libunwind/libcxxabi/libcxx
|
||||
COPY build-libcxx.sh ./
|
||||
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX
|
||||
RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
|
||||
|
||||
# Build mingw-w64's extra libraries
|
||||
COPY build-mingw-w64-libraries.sh ./
|
||||
RUN ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX
|
||||
RUN ./build-mingw-w64-libraries.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
|
||||
|
||||
# Build C test applications
|
||||
ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
|
||||
@@ -152,7 +154,7 @@ RUN cd test && \
|
||||
|
||||
# Build libssp
|
||||
COPY build-libssp.sh libssp-Makefile ./
|
||||
RUN ./build-libssp.sh $TOOLCHAIN_PREFIX
|
||||
RUN ./build-libssp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
|
||||
|
||||
RUN cd test && \
|
||||
for arch in $TOOLCHAIN_ARCHS; do \
|
||||
@@ -167,7 +169,7 @@ RUN cd test && \
|
||||
|
||||
# Build OpenMP
|
||||
COPY build-openmp.sh ./
|
||||
RUN ./build-openmp.sh $TOOLCHAIN_PREFIX
|
||||
RUN ./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS
|
||||
|
||||
# OpenMP on windows only supports x86.
|
||||
RUN cd test && \
|
||||
|
||||
Reference in new issue
Block a user