summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSt├ęphane MOTTELET <stephane.mottelet@utc.fr>2019-04-24 16:58:40 +0200
committerClement DAVID <clement.david@esi-group.com>2019-07-24 15:27:41 +0200
commit11e9ecd2cd83a83921a4ed568ee0c3c89fe2a34b (patch)
tree957cba38c8e1afc9d6de6367fe66f5715baf13f5
parentf6d82aa7bb0a39745077410352c22a167a45f1c0 (diff)
downloadscilab-11e9ecd2cd83a83921a4ed568ee0c3c89fe2a34b.zip
scilab-11e9ecd2cd83a83921a4ed568ee0c3c89fe2a34b.tar.gz
[casd] trzeros crashed under OSX when using gfortran
Change-Id: I7fedb7f2058d1b6bd98f6df38927a2bd816d8842
-rw-r--r--scilab/modules/cacsd/Makefile.am5
-rw-r--r--scilab/modules/cacsd/Makefile.in4
2 files changed, 9 insertions, 0 deletions
diff --git a/scilab/modules/cacsd/Makefile.am b/scilab/modules/cacsd/Makefile.am
index d0222d6..249817f 100644
--- a/scilab/modules/cacsd/Makefile.am
+++ b/scilab/modules/cacsd/Makefile.am
@@ -212,6 +212,11 @@ else
212noinst_LTLIBRARIES = libscicacsd-algo.la libscicacsd.la 212noinst_LTLIBRARIES = libscicacsd-algo.la libscicacsd.la
213endif 213endif
214 214
215if IS_MACOSX
216# enforce -O0 for some files
217src/fortran/sszer.lo: src/fortran/sszer.f
218 $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -O0 -c -o src/fortran/sszer.lo src/fortran/sszer.f
219endif
215 220
216libscicacsd_la_LDFLAGS = $(AM_LDFLAGS) 221libscicacsd_la_LDFLAGS = $(AM_LDFLAGS)
217 222
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index a8658c5..603bd98 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -2028,6 +2028,10 @@ uninstall-am: uninstall-libscicacsd_la_etcDATA \
2028.PRECIOUS: Makefile 2028.PRECIOUS: Makefile
2029 2029
2030 2030
2031# enforce -O0 for some files
2032@IS_MACOSX_TRUE@src/fortran/sszer.lo: src/fortran/sszer.f
2033@IS_MACOSX_TRUE@ $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) -O0 -c -o src/fortran/sszer.lo src/fortran/sszer.f
2034
2031# This target enables tests for Scilab 2035# This target enables tests for Scilab
2032check-local: $(top_builddir)/scilab-bin test 2036check-local: $(top_builddir)/scilab-bin test
2033 if test -d $(mydatadir)/tests; then \ 2037 if test -d $(mydatadir)/tests; then \