File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
54
54
CROSS_COMPILE=i686-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
55
55
CROSS_COMPILE=i686-w64-mingw32 /opt/lib/build_libs.sh && \
56
56
# 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
58
58
59
59
FROM ubuntu:latest
60
60
# Copy all the installed toolchains and compiled libs
Original file line number Diff line number Diff line change @@ -5,6 +5,7 @@ export PREFIX=/opt/lib/${CROSS_COMPILE}
5
5
if [ x$CROSS_COMPILER == x ]; then
6
6
CROSS_COMPILER=${CROSS_COMPILE} -gcc
7
7
CROSS_COMPILER_CXX=${CROSS_COMPILE} -g++
8
+ # AR=${CROSS_COMPILE}-ar
8
9
else
9
10
export CC=$CROSS_COMPILER
10
11
export CXX=$CROSS_COMPILER ++
@@ -53,6 +54,10 @@ if [[ $CROSS_COMPILE == "i686-w64-mingw32" ]] ; then
53
54
CMAKE_EXTRA_FLAG=" $CMAKE_EXTRA_FLAG -DCMAKE_TOOLCHAIN_FILE=./cmake/Toolchain-i686-w64-mingw32.cmake"
54
55
fi
55
56
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
+
56
61
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" ../
57
62
make
58
63
make install
You can’t perform that action at this time.
0 commit comments