Mercurial > mxe-octave

changeset 5836:258c97855a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ICU4C: Use MXE compilers. * src/icu4c.mk: Configure to use MXE's compilers explicitly. Otherwise, the build system would prefer a clang compiler installed on the build system which wouldn't work in MXE's build tree.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 11 Aug 2021 18:30:30 +0200
parents 93d20ff5d6a6
children d659f1a97147
files src/icu4c.mk
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/icu4c.mk	Wed Aug 11 14:51:14 2021 +0200
+++ b/src/icu4c.mk	Wed Aug 11 18:30:30 2021 +0200
@@ -16,13 +16,14 @@
 endef
 
 ifeq ($(MXE_NATIVE_BUILD),no)
-define $(PKG)_BUILD
+  define $(PKG)_BUILD
     # build some native tools
     mkdir '$(1).native' && cd '$(1).native' && '$(1)/source/configure'
     $(MAKE) -C '$(1).native' -j '$(JOBS)'
 
     # build cross
-    mkdir '$(1).cross' && cd '$(1).cross' && '$(1)/source/configure' \
+    mkdir '$(1).cross' && cd '$(1).cross' && \
+      '$(1)/source/configure' \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
@@ -34,13 +35,15 @@
     $(MAKE) -C '$(1).cross' -j '$(JOBS)' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS)
     $(MAKE) -C '$(1).cross' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS) DESTDIR='$(3)'
     $(INSTALL) -d '$(3)$(HOST_BINDIR)'
-    #mv -fv $(3)$(HOST_LIBDIR)/icu*.dll '$(3)$(HOST_BINDIR)/'
+    # mv -fv $(3)$(HOST_LIBDIR)/icu*.dll '$(3)$(HOST_BINDIR)/'
     $(INSTALL) -d '$(3)$(BUILD_TOOLS_PREFIX)/bin/'
     $(LN_SF) '$(HOST_BINDIR)/icu-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)icu-config'
-endef
+  endef
 else
-define $(PKG)_BUILD
-    mkdir '$(1).native' && cd '$(1).native' && '$(1)/source/configure' \
+  define $(PKG)_BUILD
+    mkdir '$(1).native' && cd '$(1).native' && \
+      '$(1)/source/configure' \
+        CC=$(MXE_CC) CXX=$(MXE_CXX) AR=$(MXE_AR) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         PKG_CONFIG='$(MXE_PKG_CONFIG)' \
@@ -48,6 +51,6 @@
         --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1).native' -j '$(JOBS)' $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS)
     $(MAKE) -C '$(1).native' -j 1 install $(MXE_DISABLE_DOCS) $(MXE_DISABLE_PROGS)
-endef
+  endef
 endif