aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2021-10-12 10:37:34 +0300
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2021-10-13 16:32:12 +0300
commit3ed4116a989036b454f22471736ceba0084b68ca (patch)
treeaef6c9ead3369c7f1e89fce286bfb88ac729cd6e
parent88f9251e3183646994cf5d584916eac0176251b0 (diff)
downloadsciteco-3ed4116a989036b454f22471736ceba0084b68ca.tar.gz
build Lexilla with BASE_FLAGS='' - fixes Mac OS builds
* The default build system includes -arch arm64 -arch x86_64 (builds for both platforms). These flags are apparently not supported by the SDK on the build server.
-rw-r--r--contrib/scintilla.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/scintilla.am b/contrib/scintilla.am
index 0a0334f..6c75e65 100644
--- a/contrib/scintilla.am
+++ b/contrib/scintilla.am
@@ -57,6 +57,12 @@ MAKE_LEXILLA = $(MAKE) -C @LEXILLA_PATH@/src \
CC='@CC@' CXX='@CXX@' \
AR='@AR@' RANLIB='@RANLIB@'
+# FIXME: Makes sure that -arch arm64 -arch x86_64
+# will not be used on Mac OS as it is not supported
+# by all SDKs.
+# The remaining BASE_FLAGS should not be important.
+MAKE_LEXILLA += BASE_FLAGS=''
+
.PHONY: make-lexilla
make-lexilla:
$(MAKE_LEXILLA) ../bin/liblexilla.a