Mercurial > mxe-octave

diff src/mesa.mk @ 7180:e15cecabced0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LLVM: Update to 18.1.4 * src/llvm.mk: Update version and checksum. It is no longer possible to build a shared libLLVM.dll for Windows in newer versions of LLVM because the maximum number of symbols that can be exported from a DLL is exceeded. Build static libraries instead. Set a windows-gnu target because the library naming scheme that llvm-config expects for windows-msvc (the default) is different. No changes for Linux build rule. * src/mesa.mk: Use static LLVM libraries when building for Windows.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 26 Apr 2024 21:45:40 +0200
parents e20a7969e7e1
children
line wrap: on
line diff
--- a/src/mesa.mk	Thu Apr 25 10:35:22 2024 -0400
+++ b/src/mesa.mk	Fri Apr 26 21:45:40 2024 +0200
@@ -24,6 +24,7 @@
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   $(PKG)_MESON_TOOLCHAIN_FILE := --cross-file '$(MESON_TOOLCHAIN_FILE)'
+  $(PKG)_LLVM_FLAGS := -Dshared-llvm=disabled
 else
   ifeq ($(USE_SYSTEM_X11_LIBS),no)
     $(PKG)_DEPS += dri2proto glproto libdrm libxshmfence x11 xdamage xext xfixes xrandr
@@ -39,6 +40,8 @@
   $(PKG)_X11_FLAGS := -Dplatforms='x11' \
       -Dglx=xlib \
       $($(PKG)_BUILD_X11_LIBS_FLAGS)
+
+  $(PKG)_LLVM_FLAGS := -Dshared-llvm=enabled
 endif
 
 define $(PKG)_BUILD
@@ -51,7 +54,7 @@
       -Dvulkan-drivers='' \
       -Degl=disabled \
       -Dgbm=disabled \
-      -Dshared-llvm=enabled
+      $($(PKG)_LLVM_FLAGS)
 
   cd '$(1)/.build' && DESTDIR=$(3) ninja -j $(JOBS) install