Mercurial > mxe-octave

changeset 5652:eccf230ad6c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave.mk: Add double-quotes only for mingw hosts (bug #59923). * src/default-octave.mk: Adding double-quotes to the CPPFLAGS and LDFLAGS breaks builds for the gnu-linux target. Add double-quotes only for mingw targets.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 07 Feb 2021 10:52:22 +0100
parents 2d57e8e16bbb
children d52c26fc0820
files src/default-octave.mk
diffstat 1 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Tue Feb 02 09:17:06 2021 +0100
+++ b/src/default-octave.mk	Sun Feb 07 10:52:22 2021 +0100
@@ -117,15 +117,21 @@
   $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
 endif
 
-# This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with
-# double quoted paths.
-$(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"'
-ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
-  $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"'
+ifeq ($(MXE_SYSTEM),mingw)
+  # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with
+  # double quoted paths.
+  $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"'
+  ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"'
+  else
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"'
+  endif
 else
-  $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"'
+  $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS)
+  $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS)
 endif
 
+
 ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
   # - Enable atomic refcount (required for QtHandles)
@@ -140,8 +146,13 @@
     CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
 else
   $(PKG)_PREFIX := '$(HOST_PREFIX)'
-  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
-    LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"'
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"'
+  else
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+  endif
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)