diff options
| author | Balaji V. Iyer <balaji.v.iyer@intel.com> | 2013-11-12 23:13:13 +0000 |
|---|---|---|
| committer | Balaji V. Iyer <bviyer@gcc.gnu.org> | 2013-11-12 15:13:13 -0800 |
| commit | f8ae0b2ac5d94fa0a537909a6f49f00657f3e3fa (patch) | |
| tree | 105fe52d695c1ad43e5fa33bcf6b7dc2d29d5b65 /libcilkrts | |
| parent | 115d1851826d533e0676c991ca4e4216ff32782e (diff) | |
| download | gcc-f8ae0b2ac5d94fa0a537909a6f49f00657f3e3fa.zip gcc-f8ae0b2ac5d94fa0a537909a6f49f00657f3e3fa.tar.gz gcc-f8ae0b2ac5d94fa0a537909a6f49f00657f3e3fa.tar.bz2 | |
Makefile.am (libcilkrts_la_LDFLAGS): Added a check for availability of "-ldl" flag.
2013-11-12 Balaji V. Iyer <balaji.v.iyer@intel.com>
* Makefile.am (libcilkrts_la_LDFLAGS): Added a check for availability
of "-ldl" flag.
* configure.ac: Likewise.
* configure: Regenerate
* Makefile.in: Likewise.
From-SVN: r204723
Diffstat (limited to 'libcilkrts')
| -rw-r--r-- | libcilkrts/ChangeLog | 8 | ||||
| -rw-r--r-- | libcilkrts/Makefile.am | 2 | ||||
| -rw-r--r-- | libcilkrts/Makefile.in | 6 | ||||
| -rw-r--r-- | libcilkrts/configure | 13 | ||||
| -rw-r--r-- | libcilkrts/configure.ac | 3 |
5 files changed, 25 insertions, 7 deletions
diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 7f94aef..dd447d8 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,11 @@ +2013-11-12 Balaji V. Iyer <balaji.v.iyer@intel.com> + + * Makefile.am (libcilkrts_la_LDFLAGS): Added a check for availability + of "-ldl" flag. + * configure.ac: Likewise. + * configure: Regenerate + * Makefile.in: Likewise. + 2013-11-08 Balaji V. Iyer <balaji.v.iyer@intel.com> PR c/59039 diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am index 1a8bafa..56bc9eb 100644 --- a/libcilkrts/Makefile.am +++ b/libcilkrts/Makefile.am @@ -91,7 +91,7 @@ include include/internal/rev.mk #libcilkrts_la_LDFLAGS = -rpath '$(libdir)' libcilkrts_la_LDFLAGS = -version-info 5:0:0 -libcilkrts_la_LDFLAGS += -lpthread -ldl +libcilkrts_la_LDFLAGS += -lpthread @lt_cv_dlopen_libs@ # If we're building on Linux, use the Linux version script if LINUX_LINKER_SCRIPT diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index a35eb7b..5066bef 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -312,6 +312,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_cv_dlopen_libs = @lt_cv_dlopen_libs@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ @@ -395,8 +396,9 @@ CILK_REVISION = 3902 #libcilkrts_la_LDFLAGS = -rpath '$(libdir)' # Hack for Cygwin -libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread -ldl \ - $(am__append_1) $(am__append_2) -no-undefined +libcilkrts_la_LDFLAGS = -version-info 5:0:0 -lpthread \ + @lt_cv_dlopen_libs@ $(am__append_1) $(am__append_2) \ + -no-undefined # C/C++ header files for Cilk. cilkincludedir = $(includedir)/cilk diff --git a/libcilkrts/configure b/libcilkrts/configure index 41deb9f..2461b51 100644 --- a/libcilkrts/configure +++ b/libcilkrts/configure @@ -604,6 +604,7 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +lt_cv_dlopen_libs toolexeclibdir toolexecdir CXXCPP @@ -4982,6 +4983,10 @@ else fi +enable_dlopen=yes + + + case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -7587,8 +7592,6 @@ done - enable_dlopen=no - enable_win32_dll=no @@ -11057,7 +11060,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11060 "configure" +#line 11063 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11163,7 +11166,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11166 "configure" +#line 11169 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14419,6 +14422,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + # Must be last cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure diff --git a/libcilkrts/configure.ac b/libcilkrts/configure.ac index 4582d80..8af1bf0 100644 --- a/libcilkrts/configure.ac +++ b/libcilkrts/configure.ac @@ -146,9 +146,12 @@ case "${host}" in esac AM_CONDITIONAL(MAC_LINKER_SCRIPT, test "$mac_linker_script" = "yes") +AC_LIBTOOL_DLOPEN AM_PROG_LIBTOOL AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) +AC_SUBST(lt_cv_dlopen_libs) + # Must be last AC_OUTPUT |