Browse Source

IOS-2882 sequoia macOS works

IOS-2882
Andreas Buff 3 months ago
parent
commit
bca68b3898
2 changed files with 5 additions and 3 deletions
  1. +1
    -1
      CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj
  2. +4
    -2
      buildcode/sequoia.code

+ 1
- 1
CommonPEPDependencies/CommonPEPDependencies.xcodeproj/project.pbxproj View File

@ -802,7 +802,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = "/bin/sh -l";
shellScript = "# Note: `-l`(login shell) needed to find `wget`\nSCRIPTS_DIR=\"${PROJECT_DIR}/..\"\nPREFIX=\"${PROJECT_DIR}/$(${SCRIPTS_DIR}/get-config-prefix.sh)\"\nBUILD_SCRIPT=\"${SCRIPTS_DIR}/build-sequoia-macOS.sh\" \nsh \"${BUILD_SCRIPT}\" \"${PREFIX}\"\n";
shellScript = "# Note: `-l`(login shell) needed to find `wget`\nLIB_NAME=\"sequoia\"\n\nSCRIPTS_DIR=\"${PROJECT_DIR}/..\"\nPREFIX=\"${PROJECT_DIR}/$(${SCRIPTS_DIR}/get-config-prefix.sh)\"\n\nBUILD_SCRIPT=\"${SCRIPTS_DIR}/generate_and_run_mac_dependency_build_script.sh\" \nsh \"${BUILD_SCRIPT}\" $LIB_NAME \"${PREFIX}\"\n";
showEnvVarsInLog = 0;
};
1585EED9269EF98B00B822E1 /* Build */ = {


+ 4
- 2
buildcode/sequoia.code View File

@ -16,6 +16,8 @@ build_ios()
cargo update
rustup run nightly cargo update
NETTLE_PREGENERATED_BINDINGS="${NETTLE_BINDINGS}" PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$OUTPUT_DIR/${ARCH}/lib/pkgconfig RUSTFLAGS="-L ${CURRENT_LIB_DIR}/lib" rustup run nightly cargo build --target ${TARGET} -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
# copy artefacts
cp "${SEQUOIA_DIR}/target/${TARGET}/release"/*.a "${CURRENT_LIB_DIR}/lib"
}
build_macos()
@ -34,6 +36,7 @@ build_macos()
echo "Unhandled ARCH"
exit 1
fi
cp "${SEQUOIA_DIR}/target/${HOST}/release"/*.a "${CURRENT_LIB_DIR}/lib"
}
@ -45,6 +48,5 @@ pushd ${SEQUOIA_DIR}
fi
popd
# copy artefacts
cp "${SEQUOIA_DIR}/target/${TARGET}/release"/*.a "${CURRENT_LIB_DIR}/lib"
# copy headers
cp -R "${SEQUOIA_DIR}/openpgp-ffi/include"/* "${CURRENT_LIB_DIR}/include/"

Loading…
Cancel
Save