Skip to content

Commit 4d4a79f

Browse files
committed
override ar and ranlib used by macos
1 parent 1a67c15 commit 4d4a79f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
5454
CROSS_COMPILE=i686-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
5555
CROSS_COMPILE=i686-w64-mingw32 /opt/lib/build_libs.sh && \
5656
# CROSS_COMPILER is used to override the compiler
57-
CROSS_COMPILER=o64-clang CROSS_COMPILE=x86_64-apple-darwin13 /opt/lib/build_libs.sh
57+
CROSS_COMPILER=o64-clang CROSS_COMPILE=x86_64-apple-darwin13 AR=/opt/osxcross/target/bin/x86_64-apple-darwin13-ar RANLIB=/opt/osxcross/target/bin/x86_64-apple-darwin13-ranlib /opt/lib/build_libs.sh
5858

5959
FROM ubuntu:latest
6060
# Copy all the installed toolchains and compiled libs

deps/build_libs.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export PREFIX=/opt/lib/${CROSS_COMPILE}
55
if [ x$CROSS_COMPILER == x ]; then
66
CROSS_COMPILER=${CROSS_COMPILE}-gcc
77
CROSS_COMPILER_CXX=${CROSS_COMPILE}-g++
8+
# AR=${CROSS_COMPILE}-ar
89
else
910
export CC=$CROSS_COMPILER
1011
export CXX=$CROSS_COMPILER++
@@ -53,6 +54,10 @@ if [[ $CROSS_COMPILE == "i686-w64-mingw32" ]] ; then
5354
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_TOOLCHAIN_FILE=./cmake/Toolchain-i686-w64-mingw32.cmake"
5455
fi
5556

57+
if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
58+
CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_AR=$AR -DCMAKE_RANLIB=$RANLIB"
59+
fi
60+
5661
cmake -DCMAKE_C_COMPILER=$CROSS_COMPILER -DCMAKE_CXX_COMPILER=$CROSS_COMPILER_CXX -DCMAKE_INSTALL_PREFIX="$PREFIX" $CMAKE_EXTRA_FLAG -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../
5762
make
5863
make install

0 commit comments

Comments
 (0)