Changeset 14387

Timestamp:

02/25/13 22:20:41 (12 years ago)

Author:

Eric.Larour

Message:

CHG: backtracking from LIBPATH to L option for cccl. Also, using ar-lib for microsoft linker

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (5 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -67 +67 @@
                         export CXXFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
                         export CFLAGS="-DWIN32 -D_INTEL_WIN_ -EHsc"
-                        export AR=lib
+                        export AR="ar-lib lib"
                         export RANLIB=true
                         OSLIBS="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"
@@ -549 +549 @@
                         *cygwin*)
                         if test $PETSC_MAJOR -lt 3 ; then
-                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" libpetscksp.lib libpetscdm.lib libpetscmat.lib libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
+                                PETSCLIB="-L$PETSC_ROOT/lib libpetscksp.lib libpetscdm.lib libpetscmat.lib libpetscvec.lib libpetscsnes.lib libpetscts.lib libmpiuni.lib libpetsc.lib"
                         else
-                                PETSCLIB="-link -LIBPATH:\"$PETSC_ROOT/lib\" libpetsc.lib"
+                                PETSCLIB="-L$PETSC_ROOT/lib libpetsc.lib"
                                 if test $PETSC_MAJOR -gt 3 || test $PETSC_MINOR -ge 3; then PETSCLIB+=" libmetis.lib"; fi
                         fi
@@ -614 +614 @@
                                 case "${host_os}" in
                                         *cygwin*)
-                                        METISLIB="-LIBPATH:\"$METIS_ROOT\" libmetis.lib"
+                                        METISLIB="-L$METIS_ROOT libmetis.lib"
                                         ;;
                                         *linux*)
@@ -630 +630 @@
                                 case "${host_os}" in
                                         *cygwin*)
-                                        METISLIB="-LIBPATH:\"$METIS_ROOT\" libmetis.lib"
+                                        METISLIB="-L$METIS_ROOT libmetis.lib"
                                         ;;
                                         *linux*)
@@ -755 +755 @@
                 case "${host_os}" in
                         *cygwin*)
-                        BLASLAPACKLIB="-link -LIBPATH:\"$BLASLAPACK_ROOT\" libf2cblas.lib  libf2clapack.lib"
+                        BLASLAPACKLIB="-L$BLASLAPACK_ROOT libf2cblas.lib  libf2clapack.lib"
                         ;;
                         *linux*)