aboutsummaryrefslogtreecommitdiff
path: root/tools/depends
diff options
context:
space:
mode:
authorfuzzard <fuzzard@users.noreply.github.com>2022-06-19 02:54:09 +1000
committerGitHub <noreply@github.com>2022-06-19 02:54:09 +1000
commita8cd8aaeb66a506fb99d582653ea08462c8211d6 (patch)
tree2b0a37f05f88e8b53d85f1bce210123769231074 /tools/depends
parent5857f3324aeda54f129b1ff9be93bc1eb3aee8e9 (diff)
parent671ee99cddc20def7ea1daaca83b1ee8a5176c73 (diff)
Merge pull request #21573 from fuzzard/fix_pycrypto
[tools/depends][target] pythonmodules fix ios/tvos linking incorrect arch
Diffstat (limited to 'tools/depends')
-rw-r--r--tools/depends/target/pythonmodule-pil/Makefile3
-rw-r--r--tools/depends/target/pythonmodule-pycryptodome/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile
index a012427b81..597dfafb78 100644
--- a/tools/depends/target/pythonmodule-pil/Makefile
+++ b/tools/depends/target/pythonmodule-pil/Makefile
@@ -33,9 +33,10 @@ ifeq (darwin, $(findstring darwin, $(HOST)))
# Work around an issue with xcode 11 stripping -arch arm64 flags.
# Not required for xcode 12+, but doesnt hurt either.
CFLAGS+= -target arm64-apple-darwin
+ LDFLAGS+= -target arm64-apple-darwin
endif
- LDSHARED:=$(CC) -bundle -undefined dynamic_lookup
+ LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
export ZLIB_ROOT=$(SDKROOT)/usr
endif
diff --git a/tools/depends/target/pythonmodule-pycryptodome/Makefile b/tools/depends/target/pythonmodule-pycryptodome/Makefile
index 1fa504b0f2..a4e688b4b3 100644
--- a/tools/depends/target/pythonmodule-pycryptodome/Makefile
+++ b/tools/depends/target/pythonmodule-pycryptodome/Makefile
@@ -14,8 +14,9 @@ ifeq (darwin, $(findstring darwin, $(HOST)))
# Work around an issue with xcode 11 stripping -arch arm64 flags.
# Not required for xcode 12+, but doesnt hurt either.
CFLAGS+= -target arm64-apple-darwin
+ LDFLAGS+= -target arm64-apple-darwin
endif
- LDSHARED:=$(CC) -bundle -undefined dynamic_lookup
+ LDSHARED:=$(CC) -bundle -undefined dynamic_lookup $(LDFLAGS)
endif
ifeq ($(TARGET_PLATFORM),appletvos)