mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-07 09:50:25 -08:00
Code Issues Projects Releases Packages Wiki Activity

When the user supplies a value for LDFLAGS, include it in SHARED_LDFLAGS and BUNDLE_LDFLAGS. The GMP library and the Boehm-Weiser garbage collector need not be included in CLIBS.

Browse source
This commit is contained in:
jjgarcia 2003-11-10 08:55:06 +00:00
parent c1911e090d
commit f7c7d6c88f
5 changed files with 22 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/aclocal.m4 vendored
View file

@ -136,30 +136,30 @@ case "${host_os}" in
# libdir may have a dollar expression inside
linux*)
thehost='linux'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH='-Wl,--rpath,~A'
CLIBS="-ldl"
# Maybe CFLAGS="-D_ISOC99_SOURCE ${CFLAGS}" ???
;;
freebsd*)
thehost='freebsd'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH="-Wl,--rpath,~A"
CLIBS=""
;;
netbsd*)
thehost='netbsd'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH="-Wl,--rpath,~A"
CLIBS=""
;;
solaris*)
thehost='sun4sol2'
SHARED_LDFLAGS='-dy -G'
BUNDLE_LDFLAGS='-dy -G'
SHARED_LDFLAGS="-dy -G ${LDFLAGS}"
BUNDLE_LDFLAGS="-dy -G ${LDFLAGS}"
LDRPATH='-Wl,-R,~A'
TCPLIBS='-lsocket -lnsl -lintl'
CLIBS='-ldl'
@ -176,8 +176,8 @@ case "${host_os}" in
shared='yes'
SHAREDEXT='dylib'
PICFLAG='-fPIC -fno-common'
SHARED_LDFLAGS='-dynamiclib -flat_namespace -undefined suppress'
BUNDLE_LDFLAGS='-bundle'
SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
LDRPATH=''
LDINSTALLNAME="-Wl,-install_name,${libdir}/${SHAREDPREFIX}ecl.${SHAREDEXT}"
;;

2
src/cmp/cmpcfg.lsp.in
View file

@ -5,7 +5,7 @@
(in-package "COMPILER")
(setq *cc* "@ECL_CC@")
(setq *cc-flags* "@CFLAGS@ @LSPCFLAGS@")
(setq *ld-flags* "@LDRPATH@ @LDFLAGS@ -lecl @CLIBS@")
(setq *ld-flags* "@LDRPATH@ @LDFLAGS@ -lecl -lgmp -lgc @CLIBS@")
#+dlopen
(setq *ld-shared-flags* "@LDRPATH@ @SHARED_LDFLAGS@ @LDFLAGS@ -lecl @CLIBS@")
#+dlopen

2
src/compile.lsp.in
View file

@ -71,7 +71,7 @@ cd ..; rm -rf tmp/* @LIBPREFIX@{lsp,clos} "))
;;
;; We do not need the -rpath flag for the library, nor -lecl.
;;
(let ((c::*ld-shared-flags* "@SHARED_LDFLAGS@ @CLIBS@"))
(let ((c::*ld-shared-flags* "@SHARED_LDFLAGS@ -lgmp -lgc @CLIBS@"))
(c::shared-cc (compile-file-pathname "ecl" :type :dll)
"c/main.@OBJEXT@"
(compile-file-pathname "ecl" :type :lib)

29
src/configure vendored
View file

@ -3866,30 +3866,30 @@ case "${host_os}" in
# libdir may have a dollar expression inside
linux*)
thehost='linux'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH='-Wl,--rpath,~A'
CLIBS="-ldl"
# Maybe CFLAGS="-D_ISOC99_SOURCE ${CFLAGS}" ???
;;
freebsd*)
thehost='freebsd'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH="-Wl,--rpath,~A"
CLIBS=""
;;
netbsd*)
thehost='netbsd'
SHARED_LDFLAGS='-shared'
BUNDLE_LDFLAGS='-shared'
SHARED_LDFLAGS="-shared ${LDFLAGS}"
BUNDLE_LDFLAGS="-shared ${LDFLAGS}"
LDRPATH="-Wl,--rpath,~A"
CLIBS=""
;;
solaris*)
thehost='sun4sol2'
SHARED_LDFLAGS='-dy -G'
BUNDLE_LDFLAGS='-dy -G'
SHARED_LDFLAGS="-dy -G ${LDFLAGS}"
BUNDLE_LDFLAGS="-dy -G ${LDFLAGS}"
LDRPATH='-Wl,-R,~A'
TCPLIBS='-lsocket -lnsl -lintl'
CLIBS='-ldl'
@ -3906,8 +3906,8 @@ case "${host_os}" in
shared='yes'
SHAREDEXT='dylib'
PICFLAG='-fPIC -fno-common'
SHARED_LDFLAGS='-dynamiclib -flat_namespace -undefined suppress'
BUNDLE_LDFLAGS='-bundle'
SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
LDRPATH=''
LDINSTALLNAME="-Wl,-install_name,${libdir}/${SHAREDPREFIX}ecl.${SHAREDEXT}"
;;
@ -4249,12 +4249,8 @@ else
LIBRARIES="${LIBRARIES} ${LIBPREFIX}gc.${LIBEXT}"
SUBDIR="${SUBDIR} gc"
BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
if test ${shared} = "no"; then
CLIBS="-lgc ${CLIBS}"
fi
else
BOEHM_HEADERS=""
CLIBS="-lgc ${CLIBS}"
fi
EXTRA_OBJS="${EXTRA_OBJS} alloc_2.${OBJEXT}"
cat >>confdefs.h <<\_ACEOF
@ -4274,11 +4270,6 @@ fi
if test ${local_gmp} = "no" ; then
LIBRARIES="${LIBRARIES} ${LIBPREFIX}gmp.${LIBEXT}"
SUBDIR="${SUBDIR} gmp"
if test ${shared} = "no"; then
CLIBS="-lgmp ${CLIBS}"
fi
else
CLIBS="-lgmp ${CLIBS}"
fi
if test ${runtime} ; then
cat >>confdefs.h <<\_ACEOF

9
src/configure.in
View file

@ -179,12 +179,8 @@ else
LIBRARIES="${LIBRARIES} ${LIBPREFIX}gc.${LIBEXT}"
SUBDIR="${SUBDIR} gc"
BOEHM_HEADERS="-I\$(top_srcdir)/gc/include"
if test ${shared} = "no"; then
CLIBS="-lgc ${CLIBS}"
fi
else
BOEHM_HEADERS=""
CLIBS="-lgc ${CLIBS}"
fi
EXTRA_OBJS="${EXTRA_OBJS} alloc_2.${OBJEXT}"
AC_DEFINE(GBC_BOEHM)
@ -198,11 +194,6 @@ fi
if test ${local_gmp} = "no" ; then
LIBRARIES="${LIBRARIES} ${LIBPREFIX}gmp.${LIBEXT}"
SUBDIR="${SUBDIR} gmp"
if test ${shared} = "no"; then
CLIBS="-lgmp ${CLIBS}"
fi
else
CLIBS="-lgmp ${CLIBS}"
fi
if test ${runtime} ; then
AC_DEFINE(RUNTIME)