Changeset: 6c91e87506f3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c91e87506f3
Modified Files:
configure.ag
Branch: default
Log Message:
use -pthread again also for clang (3.8 on fedora requires this).
use dirty sed hack to change -fopenmp into -fopenmp=libgomp, to be able to
compile clang with R
diffs (24 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1462,7 +1462,10 @@ AS_VAR_IF([have_pthread], [no], [], [
#
https://www.monetdb.org/pipermail/developers-list/2014-March/004264.html
# a better alternative might be required but is
# still pending ...
- ],
+ PTHREAD_INCS="-pthread"
+ PTHREAD_LIBS="-pthread"
+ CPPFLAGS="$CPPFLAGS $PTHREAD_INCS"
+ LIBS="$LIBS $PTHREAD_LIBS"],
[yes-auto-*|yes-yes-*], [
# use GCC's knowledge about the target platform, sets
flags
# for both the preprocessor as well as the linker
@@ -1829,7 +1832,7 @@ AS_VAR_IF([enable_rintegration], [no], [
why_have_libr="(libR library not found)"
enable_rintegration=no
disable_rintegration="(libR library not found)"])],
- [AS_IF([RHOME=`$RCMD RHOME` && libr_CFLAGS=`$RCMD CMD config
--cppflags` && libr_LIBS=`$RCMD CMD config --ldflags`],
+ [AS_IF([RHOME=`$RCMD RHOME` && libr_CFLAGS=`$RCMD CMD config
--cppflags` && libr_LIBS=`$RCMD CMD config --ldflags | sed -e 's|-fopenmp
|-fopenmp=libgomp `],
[have_libr=yes
AC_DEFINE([HAVE_LIBR], 1, [Define if you have libR
installed])
AC_SUBST([libr_CFLAGS], [$libr_CFLAGS])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
