Problem: make osx fails

The problems are around cross-compiling libbacktrace and other libraries. Solution: make sure cross-compilation uses the right compiler
sit-fyi · Nov 1, 2018 · cd44827 · cd44827
1 parent ee9cfb9
commit cd44827
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build-tools/cross-compile-osx/Dockerfile b/build-tools/cross-compile-osx/Dockerfile
@@ -7,7 +7,9 @@ RUN cd osxcross && UNATTENDED=1 OSX_VERSION_MIN=10.7 ./build.sh
 ENV PATH="/osxcross/target/bin:$PATH"
 ENV CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER x86_64-apple-darwin15-clang
 ENV CC_X86_64_APPLE_DARWIN_LINKER x86_64-apple-darwin15-clang
-ENV CC x86_64-apple-darwin15-cc
 ENV CMAKE_C_LINK_EXECUTABLE x86_64-apple-darwin15-ld
 ENV CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN x86_64-apple-darwin15-cc
 ENV CMAKE_C_COMPILER x86_64-apple-darwin15-cc
+ENV CROSS_COMPILE x86_64-apple-darwin15-
+COPY x86_64-apple-darwin15-gcc /osxcross/target/bin/x86_64-apple-darwin15-gcc
+RUN chmod +x /osxcross/target/bin/x86_64-apple-darwin15-gcc
diff --git a/build-tools/cross-compile-osx/x86_64-apple-darwin15-gcc b/build-tools/cross-compile-osx/x86_64-apple-darwin15-gcc
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+x86_64-apple-darwin15-cc $*