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

Commit c3a6587

Browse files
adrpoOpenModelica-Hudson
authored andcommitted
don't propagate command line arguments of make to Ipopt
- this allows to compile everything in Windows with: make -f Makefile.omdev.mingw CFLAGS=-g Belonging to [master]: - #2650
1 parent dfb7517 commit c3a6587

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ $(OMBUILDDIR)/include/omc/c/gc_pthread_redirects.h: 3rdParty/gc/include/gc_pthre
142142
(cd 3rdParty/Ipopt && ./configure --prefix="`pwd`" --with-pic "CC=$(CC)" CFLAGS="$(CFLAGS) $(EXTRA_LDFLAGS)" CXX="$(CXX) $(LDFLAGS_LIBSTDCXX)" CXXFLAGS="$(CXXFLAGS)" F77="$(FC)" LDFLAGS="-L$(OMBUILDDIR)/$(LIB_OMC) $(LDFLAGS)" --with-lapack-lib="$(LD_LAPACK)" --with-blas-lib="$(LD_LAPACK)" "--host=$(host)" --without-metis --without-HSLold --without-HSL)
143143

144144
$(OMBUILDDIR)/$(LIB_OMC)/libipopt.la: 3rdParty/Ipopt/Makefile
145-
$(MAKE) -C 3rdParty/Ipopt
146-
$(MAKE) -C 3rdParty/Ipopt install
145+
$(MAKE) -C 3rdParty/Ipopt 'MAKEOVERRIDES='
146+
$(MAKE) -C 3rdParty/Ipopt install 'MAKEOVERRIDES='
147147
test ! `uname` = Darwin || install_name_tool -id @rpath/libipopt.0.0.0.dylib 3rdParty/Ipopt/lib/libipopt.0.0.0.dylib
148148
test ! `uname` = Darwin || install_name_tool -id @rpath/libcoinmumps.1.5.2.dylib 3rdParty/Ipopt/lib/libcoinmumps.1.5.2.dylib
149149
test ! `uname` = Darwin || install_name_tool -change "`pwd`/3rdParty/Ipopt/lib/libcoinmumps.1.dylib" @rpath/libcoinmumps.1.dylib 3rdParty/Ipopt/lib/libipopt.0.0.0.dylib

0 commit comments

Comments
 (0)