The wrong OpenMP CXXFLAGS was used (it was using OPENMP_CPPFLAGS instead of OPENMP_CX... 49/10749/2
Sylvestre Ledru [Fri, 8 Mar 2013 14:33:19 +0000 (15:33 +0100)]
As a side effect, it should fix the Mac OS X build too.

Change-Id: Ib62cf298d85aa8c6b7bbde83609f3938dd58a2a8

scilab/modules/parallel/Makefile.am
scilab/modules/parallel/Makefile.in

index df476b9..12cf0de 100644 (file)
@@ -16,7 +16,7 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_parallel_run.cpp
 GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c \
 sci_gateway/c/sci_parallel_concurrency.c
 
-libsciparallel_la_CPPFLAGS= $(OPENMP_CPPFLAGS) \
+libsciparallel_la_CPPFLAGS= $(OPENMP_CXXFLAGS) \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \
index 14e1fa3..0a45b2b 100644 (file)
@@ -449,7 +449,7 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_parallel_run.cpp
 GATEWAY_C_SOURCES = sci_gateway/c/gw_parallel.c \
 sci_gateway/c/sci_parallel_concurrency.c
 
-libsciparallel_la_CPPFLAGS = $(OPENMP_CPPFLAGS) \
+libsciparallel_la_CPPFLAGS = $(OPENMP_CXXFLAGS) \
 -I$(srcdir)/includes/ \
 -I$(top_srcdir)/modules/core/includes/ \
 -I$(srcdir)/src/cpp/ \