[vlc-commits] contrib/gpg-error: fix compilation for macOS when cross-compiling

[Felix Paul Kühne]

vlc/vlc-3.0 | branch: master | Felix Paul Kühne <felix at feepk.net> | Wed Jan 24 21:37:40 2018 +0100| [0d70f4114b60c50c35428320393892318a8efad7] | committer: Jean-Baptiste Kempf

contrib/gpg-error: fix compilation for macOS when cross-compiling

(cherry picked from commit a48b98b1b40a153b29d7a2f8ca3f7349a9e10188)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0d70f4114b60c50c35428320393892318a8efad7
---

 contrib/src/gpg-error/rules.mak | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 025fdc0455..7ec95c1f47 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -32,11 +32,15 @@ ifeq ($(TIZEN_ABI), x86)
 	cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.linux-gnueabi.h
 endif
 endif
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
 	cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
 else
+ifeq ($(ARCH),aarch64)
 	cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
+else
+	cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 endif
 endif