Mercurial > mxe-octave
comparison src/libbiosig.mk @ 5749:3960e6022e88
libbiosig: Fix build with compiler installed on system (bug #10058).
* src/libbiosig.mk: Pass LDFLAGS and CFLAGS to configure and make for native
builds.
* src/libbiosig-1-mingw-install.patch: Make unversioned library a symlink to
the versioned library instead of vice versa.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 23 Apr 2021 19:08:25 +0200 |
parents | 399c7b225e13 |
children | 64002792613d |
comparison
equal
deleted
inserted
replaced
5748:399c7b225e13 | 5749:3960e6022e88 |
---|---|
21 $(PKG)_MAKE_FLAGS := TARGET=$(TARGET) CROSS=$(TARGET) | 21 $(PKG)_MAKE_FLAGS := TARGET=$(TARGET) CROSS=$(TARGET) |
22 $(PKG)_AUTOCONF_CROSS_FLAGS := \ | 22 $(PKG)_AUTOCONF_CROSS_FLAGS := \ |
23 ac_cv_func_malloc_0_nonnull=yes \ | 23 ac_cv_func_malloc_0_nonnull=yes \ |
24 ac_cv_func_realloc_0_nonnull=yes | 24 ac_cv_func_realloc_0_nonnull=yes |
25 else | 25 else |
26 $(PKG)_MAKE_FLAGS := LDLIBS='-liconv -lm -ltinyxml' | 26 $(PKG)_MAKE_FLAGS := \ |
27 LDLIBS='-liconv -lm -ltinyxml' \ | |
28 LDFLAGS=$(MXE_LDFLAGS) \ | |
29 CFLAGS=$(MXE_CFLAGS) | |
27 endif | 30 endif |
28 | 31 |
29 | 32 |
30 define $(PKG)_BUILD | 33 define $(PKG)_BUILD |
31 cd '$(1)' && ./configure \ | 34 cd '$(1)' && ./configure \ |
35 CC='$(MXE_CC)' \ | 38 CC='$(MXE_CC)' \ |
36 CXX='$(MXE_CXX)' \ | 39 CXX='$(MXE_CXX)' \ |
37 RANLIB='$(MXE_RANLIB)' \ | 40 RANLIB='$(MXE_RANLIB)' \ |
38 AR='$(MXE_AR)' \ | 41 AR='$(MXE_AR)' \ |
39 ARFLAGS=rcs \ | 42 ARFLAGS=rcs \ |
43 LDFLAGS=$(MXE_LDFLAGS) \ | |
44 CFLAGS=$(MXE_CFLAGS) \ | |
40 LIBTOOL=$(LIBTOOL) \ | 45 LIBTOOL=$(LIBTOOL) \ |
41 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ | 46 PKG_CONFIG='$(MXE_PKG_CONFIG)' \ |
42 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' | 47 PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' |
43 | 48 |
44 # make sure NDEBUG is defined | 49 # make sure NDEBUG is defined |