zefie/llvm-mingw
1
0 Fork 0
Code Activity

Avoid unnecessary absolute references to the root build directory

Browse Source
This commit is contained in:
Martin Storsjö committed 2017-11-28 16:10:36 +02:00
1 parent c457ec980f
commit 7c91fd6120
1 file changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+9 -9
View File
@@ -62,7 +62,7 @@ RUN cd mingw-w64/mingw-w64-headers && \
done done
# Install the usual $TUPLE-clang binaries # Install the usual $TUPLE-clang binaries
RUN mkdir /build/wrappers RUN mkdir wrappers
COPY wrappers/clang-target-wrapper /build/wrappers COPY wrappers/clang-target-wrapper /build/wrappers
RUN for arch in armv7 aarch64 i686 x86_64; do \ RUN for arch in armv7 aarch64 i686 x86_64; do \
for exec in clang clang++; do \ for exec in clang clang++; do \
@@ -103,7 +103,7 @@ RUN git clone -b master https://github.com/llvm-mirror/compiler-rt.git && \
# Add a symlink for i386 -> i686; we normally name the toolchain # Add a symlink for i386 -> i686; we normally name the toolchain
# i686-w64-mingw32, but due to the compiler-rt cmake peculiarities, we # i686-w64-mingw32, but due to the compiler-rt cmake peculiarities, we
# need to refer to it as i386 at this stage. # need to refer to it as i386 at this stage.
RUN cd /build/prefix && ln -s i686-w64-mingw32 i386-w64-mingw32 RUN cd $TOOLCHAIN_PREFIX && ln -s i686-w64-mingw32 i386-w64-mingw32
# Manually build compiler-rt as a standalone project # Manually build compiler-rt as a standalone project
RUN cd compiler-rt && \ RUN cd compiler-rt && \
@@ -129,8 +129,8 @@ RUN cd compiler-rt && \
-DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=TRUE \
../lib/builtins && \ ../lib/builtins && \
make -j4 && \ make -j4 && \
mkdir -p /build/prefix/lib/clang/6.0.0/lib/windows && \ mkdir -p $TOOLCHAIN_PREFIX/lib/clang/6.0.0/lib/windows && \
cp lib/windows/libclang_rt.builtins-$buildarchname.a /build/prefix/lib/clang/6.0.0/lib/windows/libclang_rt.builtins-$libarchname.a && \ cp lib/windows/libclang_rt.builtins-$buildarchname.a $TOOLCHAIN_PREFIX/lib/clang/6.0.0/lib/windows/libclang_rt.builtins-$libarchname.a && \
cd .. || exit 1; \ cd .. || exit 1; \
done done
@@ -229,7 +229,7 @@ RUN cd libcxx && \
cd .. || exit 1; \ cd .. || exit 1; \
done done
RUN cd /build/prefix/include && ln -s /build/prefix/armv7-w64-mingw32/include/c++ . RUN cd $TOOLCHAIN_PREFIX/include && ln -s ../armv7-w64-mingw32/include/c++ .
RUN cd libunwind && \ RUN cd libunwind && \
for arch in armv7 i686 x86_64; do \ for arch in armv7 i686 x86_64; do \
@@ -259,19 +259,19 @@ RUN cd libunwind && \
cd .. || exit 1; \ cd .. || exit 1; \
done done
RUN mkdir -p /build/hello RUN mkdir -p hello
COPY hello.c hello.cpp hello-exception.cpp /build/hello/ COPY hello.c hello.cpp hello-exception.cpp /build/hello/
RUN cd /build/hello && \ RUN cd hello && \
for arch in armv7 aarch64 x86_64 i686; do \ for arch in armv7 aarch64 x86_64 i686; do \
$arch-w64-mingw32-clang hello.c -o hello-$arch.exe || exit 1; \ $arch-w64-mingw32-clang hello.c -o hello-$arch.exe || exit 1; \
done done
RUN cd /build/hello && \ RUN cd hello && \
for arch in armv7 aarch64 x86_64 i686; do \ for arch in armv7 aarch64 x86_64 i686; do \
$arch-w64-mingw32-clang++ hello.cpp -o hello-cpp-$arch.exe -fno-exceptions || exit 1; \ $arch-w64-mingw32-clang++ hello.cpp -o hello-cpp-$arch.exe -fno-exceptions || exit 1; \
done done
RUN cd /build/hello && \ RUN cd hello && \
for arch in armv7 x86_64 i686; do \ for arch in armv7 x86_64 i686; do \
$arch-w64-mingw32-clang++ hello-exception.cpp -o hello-exception-$arch.exe || exit 1; \ $arch-w64-mingw32-clang++ hello-exception.cpp -o hello-exception-$arch.exe || exit 1; \
done done