[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - ios/CustomTarget_iOS_setup.mk

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Jun 10 16:54:40 UTC 2020


 ios/CustomTarget_iOS_setup.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 145d0c3c4cce549b63d3b1d9784dabf8a2e4849e
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Wed Jun 10 19:34:38 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Jun 10 18:54:08 2020 +0200

    Use xcrun python3 to find the python3 also on Macs with older Xcode
    
    There is no /usr/bin/python3 on those. With a current Xcode, it is the
    python3 that comes with Xcode that /usr/bin/python3 runs anyway.
    
    Change-Id: Iaee3d030337d6dfc37b67852a492b054fb4b9fee
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96062
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 9df34a50eaed..c8a9ccccb72f 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -45,7 +45,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2)
 
 	# generate native-code.h (used by LibreOffice.c)
-	$(SRCDIR)/solenv/bin/native-code.py \
+	xcrun python3 $(SRCDIR)/solenv/bin/native-code.py \
 	    -C -g core -g writer -g calc -g draw -g edit \
 	    > $(IOSGEN)/native-code.h
 


More information about the Libreoffice-commits mailing list