diff --git a/library_builders.sh b/library_builders.sh index b4c10be4..1dbe4b60 100644 --- a/library_builders.sh +++ b/library_builders.sh @@ -167,7 +167,7 @@ function build_libjpeg_turbo { local cmake=$(get_modern_cmake) fetch_unpack https://download.sourceforge.net/libjpeg-turbo/libjpeg-turbo-${JPEGTURBO_VERSION}.tar.gz (cd libjpeg-turbo-${JPEGTURBO_VERSION} \ - && $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_LIBDIR=/usr/local/lib . \ + && $cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib . \ && make install) # Prevent build_jpeg diff --git a/osx_utils.sh b/osx_utils.sh index 0701f9af..0b228881 100644 --- a/osx_utils.sh +++ b/osx_utils.sh @@ -476,6 +476,7 @@ function macos_intel_cross_build_setup { function macos_arm64_cross_build_setup { # Setup cross build for single arch arm_64 wheels export PLAT="arm64" + export NATIVE_PREFIX=$BUILD_PREFIX export BUILD_PREFIX=/opt/arm64-builds sudo mkdir -p $BUILD_PREFIX/lib $BUILD_PREFIX/include sudo chown -R $USER $BUILD_PREFIX @@ -492,6 +493,7 @@ function macos_arm64_cross_build_setup { export MACOSX_DEPLOYMENT_TARGET="11.0" export CROSS_COMPILING=1 export LDFLAGS+=" -arch arm64 -L$BUILD_PREFIX/lib -Wl,-rpath,$BUILD_PREFIX/lib ${FC_ARM64_LDFLAGS:-}" + export PATH="$NATIVE_PREFIX/bin:$PATH" # This would automatically let autoconf know that we are cross compiling for arm64 darwin export host_alias="aarch64-apple-darwin20.0.0" }