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

Fix for dmg build scripts #44

Merged
merged 1 commit into from
Jan 1, 2025
Merged

Fix for dmg build scripts #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tools/build-mac/apply_sigs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ CP=gcp

UNSIGNED="$1"
SIGNATURE="$2"
ARCH=x86_64
ARCH=$(uname -m)
OUTDIR="/tmp/bitcoin_safe_compare_dmg/signed_app"

if [ -z "$UNSIGNED" ]; then
Expand Down
5 changes: 3 additions & 2 deletions tools/build-mac/make_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ export CFLAGS="-g0"

# Do not build universal binaries. The default on macos 11+ and xcode 12+ is "-arch arm64 -arch x86_64"
# but with that e.g. "hid.cpython-310-darwin.so" is not reproducible as built by clang.
export ARCHFLAGS="-arch x86_64"
arch=$(uname -m)
export ARCHFLAGS="-arch $arch"

info "Installing build dependencies"
# note: re pip installing from PyPI,
Expand Down Expand Up @@ -149,7 +150,7 @@ if [ ! -f "$DLL_TARGET_DIR/libsecp256k1.2.dylib" ]; then
else
info "Skipping libsecp256k1 build: reusing already built dylib."
fi
#cp -f "$DLL_TARGET_DIR"/libsecp256k1.*.dylib "$PROJECT_ROOT/bitcoin_safe" || fail "Could not copy libsecp256k1 dylib"
cp -f "$DLL_TARGET_DIR"/libsecp256k1.*.dylib "$PROJECT_ROOT/bitcoin_safe" || fail "Could not copy libsecp256k1 dylib"

if [ ! -f "$DLL_TARGET_DIR/libzbar.0.dylib" ]; then
info "Building ZBar dylib..."
Expand Down
Loading