Changeset 15265

Timestamp:

06/13/13 16:36:11 (12 years ago)

Author:

glperez

Message:

CHG: Removed -no-undefined Libtool flag for non Windows builds.

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/wrappers/matlab/Makefile.am (modified) (1 diff)

issm/trunk-jpl/m4/issm_options.m4

@@ -125 +125 @@
                                 if  test $VENDOR = intel-win7-32; then
                                         MEXLIB="-Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib -Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib -Wl,libf2cblas.lib -Wl,libf2clapack.lib" 
-               MEXLINK=/link /DLL -export:mexFunction" 
+               MEXLINK="-no-undefined /link /DLL -export:mexFunction" 
                                 elif  test $VENDOR = intel-win7-64; then
                                         MEXLIB="/DLL -export:mexFunction -L$MATLAB_ROOT\extern\lib\win64\microsoft\ -Wl,libmx.lib -Wl,libmex.lib -Wl,libmat.lib -Wl,kernel32.lib -Wl,user32.lib -Wl,gdi32.lib -Wl,winspool.lib -Wl,comdlg32.lib -Wl,advapi32.lib -Wl,shell32.lib -Wl,ole32.lib -Wl,oleaut32.lib -Wl,uuid.lib -Wl,odbc32.lib -Wl,odbccp32.lib  -NOLOGO -INCREMENTAL:NO -manifest" 
-               MEXLINK=/link /DLL -export:mexFunction" 
+               MEXLINK="-no-undefined /link /DLL -export:mexFunction" 
                                 fi
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -110 +110 @@
 
 #Matlab part
-AM_LDFLAGS = -no-undefined -module $(MEXLINK) -shrext ${EXEEXT}  -L/usr/lib
+AM_LDFLAGS = -module $(MEXLINK) -shrext ${EXEEXT}  -L/usr/lib
 if VERSION
 AM_LDFLAGS +=