macOS: fix compilation of MEX files against Homebrew’s octave
It is necessary to link MEX files against Octave libraries, as under Windows.pac-components
parent
a5ccd0ae90
commit
e155c5cbb2
|
@ -97,16 +97,24 @@ case ${host_os} in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Define an automake conditional for the Windows platform
|
# Determine whether to link MEX files against the Octave libraries.
|
||||||
|
# mkoctfile no longer does this by default but in practice it is needed
|
||||||
|
# for Windows and macOS.
|
||||||
case ${host_os} in
|
case ${host_os} in
|
||||||
*mingw32*)
|
*mingw32*)
|
||||||
windows_api=yes
|
# This is hardcoded in src/mkoctfile.cc.in.
|
||||||
|
link_octave_libs=yes
|
||||||
|
;;
|
||||||
|
*darwin*)
|
||||||
|
# Under macOS, the Homebrew formula passes --enable-link-all-dependencies
|
||||||
|
# to the configure script.
|
||||||
|
link_octave_libs=yes
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
windows_api=no
|
link_octave_libs=no
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
AM_CONDITIONAL([WINDOWS_API], [test ${windows_api} = yes])
|
AM_CONDITIONAL([LINK_OCTAVE_LIBS], [test ${link_octave_libs} = yes])
|
||||||
|
|
||||||
# Construct final output message
|
# Construct final output message
|
||||||
if test "$enable_mex_dynareplusplus" = yes; then
|
if test "$enable_mex_dynareplusplus" = yes; then
|
||||||
|
|
|
@ -10,9 +10,8 @@ AM_FCFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG) -Wall -Wimplicit-interface
|
||||||
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG) -Wall -Wno-parentheses -Wold-style-cast
|
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG) -Wall -Wno-parentheses -Wold-style-cast
|
||||||
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
||||||
|
|
||||||
# Mimick the behaviour of mkoctfile: link against Octave libraries on Windows only
|
# See the comments in configure.ac
|
||||||
# (it is required there, otherwise we get a link failure)
|
if LINK_OCTAVE_LIBS
|
||||||
if WINDOWS_API
|
|
||||||
AM_LDFLAGS += -L"$(shell $(MKOCTFILE) -p OCTLIBDIR)"
|
AM_LDFLAGS += -L"$(shell $(MKOCTFILE) -p OCTLIBDIR)"
|
||||||
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
|
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue