OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Balaji V. Iyer 2013-11-12 23:13:13 +00:00 committed by Balaji V. Iyer
parent 115d185182
commit f8ae0b2ac5
5 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcilkrts/ChangeLog
View File

@ -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

2
libcilkrts/Makefile.am
View File

@ -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

6
libcilkrts/Makefile.in
View File

@ -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

13
libcilkrts/configure vendored
View File

@ -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

3
libcilkrts/configure.ac
View File

@ -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