Fix parallel module on some plateforms (Missing _ZSt9terminatev symbol at execution... 99/14799/1
Vincent COUVERT [Thu, 3 Jul 2014 11:57:56 +0000 (13:57 +0200)]
Change-Id: Icde024fc1dff69b8ed7502eaed900512cc353050

scilab/configure
scilab/configure.ac
scilab/modules/javasci/Makefile.in

index 3e816d3..60546f6 100755 (executable)
@@ -22659,7 +22659,7 @@ if test "$with_openmp" != no; then
 #   AC_OPENMP
     OPENMP_CFLAGS="-fopenmp"
     OPENMP_CXXFLAGS="-fopenmp"
-    OPENMP_LIBS="-lgomp"
+    OPENMP_LIBS="-lgomp -lstdc++" # Force -lstdc++ because some compilers do not add it automatically.
 
     for ac_header in omp.h
 do :
index a314752..3a6f991 100644 (file)
@@ -1418,7 +1418,7 @@ if test "$with_openmp" != no; then
 #   AC_OPENMP
     OPENMP_CFLAGS="-fopenmp"
     OPENMP_CXXFLAGS="-fopenmp"
-    OPENMP_LIBS="-lgomp"
+    OPENMP_LIBS="-lgomp -lstdc++" # Force -lstdc++ because some compilers do not add it automatically.
 
     AC_CHECK_HEADERS([omp.h], [],
      [AC_MSG_ERROR([Could not find omp.h])])
index 245b3fc..2b545a7 100644 (file)
@@ -977,9 +977,9 @@ maintainer-clean-generic:
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@clean-local:
-@JAVASCI_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \