Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
Fix compilation of zmq on OSX
Browse files Browse the repository at this point in the history
libzmq uses the LDFLAGS to find libraries, so do not send cmake LDFLAGS
that ignore linker errors since that will give compiler errors on OSX
(the makefile does not check if the symbol exists in a header; it just
compiles a program and checks linking).
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Jun 15, 2017
1 parent 86cfac4 commit f2b55cc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ CMinpack-clean:
libzmq:
test -d 3rdParty/libzmq
mkdir -p 3rdParty/libzmq/build
(cd 3rdParty/libzmq/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_AR:String="$(AR)" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DWITH_PERF_TOOL:Bool=OFF -DZMQ_BUILD_TESTS:Bool=OFF -DENABLE_CPACK:Bool=OFF -DCMAKE_BUILD_TYPE=Release .. -G $(CMAKE_TARGET))
(cd 3rdParty/libzmq/build && test -f Makefile || CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(CMAKE_CHECK_UNDEFINED_LOOKUP) -DCMAKE_VERBOSE_MAKEFILE:Bool=ON -DCMAKE_AR:String="$(AR)" -DCMAKE_COLOR_MAKEFILE:Bool=OFF -DWITH_PERF_TOOL:Bool=OFF -DZMQ_BUILD_TESTS:Bool=OFF -DENABLE_CPACK:Bool=OFF -DCMAKE_BUILD_TYPE=Release .. -G $(CMAKE_TARGET))
test -f 3rdParty/libzmq/build/lib/$(LIBZMQLIB) || $(MAKE) -C 3rdParty/libzmq/build
test ! `uname` = Darwin || install_name_tool -id @rpath/$(LIBZMQLIB) 3rdParty/libzmq/build/lib/$(LIBZMQLIB)
# copy dll/so to $(LIB_OMC) and $(builddir_bin) folders
Expand Down
5 changes: 3 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ includedir = @includedir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
CMAKE = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@CMAKE_LDFLAGS@" cmake @CMAKE_EXTRA_DEFINES@
CMAKE_RPATH = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@RPATH_QMAKE@ @CMAKE_LDFLAGS@" cmake @CMAKE_EXTRA_DEFINES@
CMAKE = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@CMAKE_LDFLAGS_UNDEFINED_LOOKUP@" cmake @CMAKE_EXTRA_DEFINES@
CMAKE_CHECK_UNDEFINED_LOOKUP = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" cmake @CMAKE_EXTRA_DEFINES@
CMAKE_RPATH = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@RPATH_QMAKE@ @CMAKE_LDFLAGS_UNDEFINED_LOOKUP@" cmake @CMAKE_EXTRA_DEFINES@
CMAKE_TARGET = "Unix Makefiles"
OPENCL = @OPENCL@
AR = @AR@
Expand Down
1 change: 1 addition & 0 deletions Makefile.omdev.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ CFLAGS =-g -O2 -falign-functions
MSGPACK_CFLAGS = -march=i686

CMAKE = $(OMDEVMSYS)/bin/cmake/bin/cmake
CMAKE_CHECK_UNDEFINED_LOOKUP = $(CMAKE)
CMAKE_TARGET = "MSYS Makefiles"

ifeq (MINGW32,$(findstring MINGW32,$(shell uname)))
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ AC_CHECK_HEADER([CL/cl.h],[OPENCL="Yes"],[
])
FINAL_MESSAGES="$FINAL_MESSAGES\nParModelica: $OPENCL"

AC_SUBST(CMAKE_LDFLAGS)
AC_SUBST(CMAKE_LDFLAGS_UNDEFINED_LOOKUP)
AC_SUBST(CMAKE_EXTRA_DEFINES)
AC_SUBST(DLLEXT)
AC_SUBST(UMFPACK_SHARED)
Expand Down Expand Up @@ -642,7 +642,7 @@ if test "$DARWIN" = "1"; then
AR_SH="sh -x ar.sh"
OMC_LIBS="$OMC_LIBS -Wl,-undefined -Wl,dynamic_lookup"
BOOTSTRAP_STATIC=""
CMAKE_LDFLAGS="-Wl,-undefined -Wl,dynamic_lookup"
CMAKE_LDFLAGS_UNDEFINED_LOOKUP="-Wl,-undefined -Wl,dynamic_lookup"
UMFPACK_SHARED=ON
CONFIG_OS=OSX
elif echo "$host" | grep -iq "mingw"; then
Expand Down

0 comments on commit f2b55cc

Please sign in to comment.