godotengine/build-containers
1
0
Fork 0
mirror of https://github.com/godotengine/build-containers.git synced 2026-01-04 18:10:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make OSX cross building more robust for newer Clang versions.

Browse Source
This commit is contained in:
Hein-Pieter van Braam-Stewart
2019-05-22 18:21:22 -07:00
parent 3872ea323a
commit 206b9e2f75
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile.osx
View File

@@ -21,10 +21,19 @@ RUN dnf -y install automake autoconf bzip2-devel clang git libicu-devel libtool
cd /root && \
ln -fs /root/osxcross/target/bin/x86_64-apple-darwin17-install_name_tool /root/osxcross/target/bin/install_name_tool && \
ln -fs /root/osxcross/target/bin/x86_64-apple-darwin17-ar /root/osxcross/target/bin/ar && \
cd /root/osxcross/ && \
./build_compiler_rt.sh && \
export CLANG_LIB_DIR=$(clang -print-search-dirs | grep "libraries: =" | tr '=' ' ' | tr ':' ' ' | awk '{print $2}') && \
mkdir -p ${CLANG_LIB_DIR}/include && \
mkdir -p ${CLANG_LIB_DIR}/lib/darwin && \
cp -rv /root/osxcross/build/compiler-rt/include/sanitizer ${CLANG_LIB_DIR}/include && \
cp -v /root/osxcross/build/compiler-rt/build/lib/darwin/*.a ${CLANG_LIB_DIR}/lib/darwin && \
cp -v /root/osxcross/build/compiler-rt/build/lib/darwin/*.dylib ${CLANG_LIB_DIR}/lib/darwin && \
curl https://download.mono-project.com/sources/mono/mono-${mono_version}.tar.bz2 | tar xj && \
cd mono-${mono_version} && \
patch -p1 < /root/files/patches/fix-mono-configure.diff && \
export PATH=/root/osxcross/target/bin:$PATH && \
export CMAKE=/root//osxcross/target/bin/x86_64-apple-darwin17-cmake && \
./autogen.sh --prefix=/root/dependencies/mono \
--build=x86_64-linux-gnu \
--host=x86_64-apple-darwin17 \
@@ -32,11 +41,11 @@ RUN dnf -y install automake autoconf bzip2-devel clang git libicu-devel libtool
--disable-mcs-build \
--with-tls=pthread \
--disable-dtrace \
--disable-executables \
mono_cv_uscore=yes \
_lt_dar_can_shared=yes \
CC=o64-clang \
CXX=o64-clang++ && \
sed -i 's/^BTLS_CMAKE_ARGS.*/BTLS_CMAKE_ARGS=-DBTLS_ARCH="x86_64" -DAPPLE=1 -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_AR:FILEPATH=ar/' mono/btls/Makefile && \
make -j && \
make install && \
rm -f /root/dependencies/mono/bin/mono /root/dependencies/mono/bin/mono-sgen && \