Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass --no-sanitize-env to cargo-lipo (todo replace) #2142

Closed
wants to merge 3 commits into from
Closed

Pass --no-sanitize-env to cargo-lipo (todo replace) #2142

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f70fb27
Pass --no-sanitize-env to cargo-lipo
link2xt Apr 4, 2024
a6d130a
Set LTO via `cargo` flags
link2xt Apr 4, 2024
b8fdc10
Remove RUSTFLAGS completely, no bitcode
link2xt Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DcCore/DcCore.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin\"\nexport PATH=\"$HOME/.cargo/bin:$PATH\"\n\nFILENAME=\"libdeltachat.a\"\nDIR=\"../deltachat-ios/libraries\"\n\n# Delete old build, if any.\nrm -f \"${DIR}/${FILENAME}\"\n\nrustc `cat ../rust-toolchain` --version\n\n# ensure all targets are installed\nrustup target add aarch64-apple-ios x86_64-apple-ios --toolchain `cat ../rust-toolchain`\n\n# --xcode-integ determines --release and --targets from Xcode's env vars.\n# Depending your setup, specify the rustup toolchain explicitly.\nRUSTFLAGS=\"-C lto=on -C embed-bitcode=yes\" \\\n cargo +`cat ../rust-toolchain` lipo --xcode-integ --manifest-path \"$DIR/deltachat-core-rust/deltachat-ffi/Cargo.toml\" --features jsonrpc\n\n# cargo-lipo drops result in different folder, depending on the config.\nif [[ $CONFIGURATION = \"Debug\" ]]; then\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/debug/${FILENAME}\"\nelse\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/release/${FILENAME}\"\nfi\n\n# Copy compiled library to DIR.\nif [ -e \"${SOURCE}\" ]; then\n cp -a \"${SOURCE}\" $DIR\nfi\n";
shellScript = "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin\"\nexport PATH=\"$HOME/.cargo/bin:$PATH\"\n\nFILENAME=\"libdeltachat.a\"\nDIR=\"../deltachat-ios/libraries\"\n\n# Delete old build, if any.\nrm -f \"${DIR}/${FILENAME}\"\n\nrustc `cat ../rust-toolchain` --version\n\n# ensure all targets are installed\nrustup target add aarch64-apple-ios x86_64-apple-ios --toolchain `cat ../rust-toolchain`\n\n# --xcode-integ determines --release and --targets from Xcode's env vars.\n# Depending your setup, specify the rustup toolchain explicitly.\nCARGO_PROFILE_RELEASE_LTO=on \\\n cargo +`cat ../rust-toolchain` lipo --xcode-integ --no-sanitize-env --manifest-path \"$DIR/deltachat-core-rust/deltachat-ffi/Cargo.toml\" --features jsonrpc\n\n# cargo-lipo drops result in different folder, depending on the config.\nif [[ $CONFIGURATION = \"Debug\" ]]; then\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/debug/${FILENAME}\"\nelse\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/release/${FILENAME}\"\nfi\n\n# Copy compiled library to DIR.\nif [ -e \"${SOURCE}\" ]; then\n cp -a \"${SOURCE}\" $DIR\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down