Mercurial > mxe-octave

changeset 3439:c9ade6d47f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Provide new variable to check whether we are doing a Windows build. * Makefile.in (MXE_WINDOWS_BUILD): New variable. * src/libgmop.mk: Use it.
author John W. Eaton <jwe@octave.org>
date Wed, 22 Jan 2014 01:09:48 -0500
parents 7113585920c9
children e24ccde182f2
files Makefile.in src/libgomp.mk
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Jan 21 13:59:09 2014 -0500
+++ b/Makefile.in	Wed Jan 22 01:09:48 2014 -0500
@@ -310,6 +310,7 @@
 HOST_INCDIR := $(HOST_PREFIX)/include
 
 ifeq ($(MXE_SYSTEM),mingw)
+  MXE_WINDOWS_BUILD := yes
   ifneq ($(MXE_NATIVE_BUILD),yes)
     MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS
     MSYS_BASE_URL := $(MSYS_URL)/Base
@@ -323,6 +324,7 @@
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
 else ifneq ($(MXE_SYSTEM),msvc)
+  MXE_WINDOWS_BUILD := yes
   MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
   ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
     MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
--- a/src/libgomp.mk	Tue Jan 21 13:59:09 2014 -0500
+++ b/src/libgomp.mk	Wed Jan 22 01:09:48 2014 -0500
@@ -14,6 +14,10 @@
     echo $(build-gcc_VERSION)
 endef
 
+ifeq ($(MXE_WINDOWS_BUILD),yes)
+  $(PKG)_SYSDEP_CONFIGURE_OPTIONS = LIBS='-lws2_32'
+endif
+
 define $(PKG)_BUILD
     mkdir -p '$(1)/build/$(TARGET)/libgomp'
     cd       '$(1)/build/$(TARGET)/libgomp' && '$(1)/libgomp/configure' \
@@ -23,7 +27,7 @@
         --enable-version-specific-runtime-libs \
         --with-gnu-ld \
         $(ENABLE_SHARED_OR_STATIC) \
-        LIBS='-lws2_32'
+        $($(PKG)_SYSDEP_CONFIGURE_OPTIONS)
     $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '$(JOBS)'
     $(MAKE) -C '$(1)/build/$(TARGET)/libgomp' -j '1' install DESTDIR='$(3)'