configure+Makefile adjustments to support --as-needed linking (do not merge, yet)
svn: r13224
This commit is contained in:
parent
6fcac5f5f4
commit
20a0a20409
4
src/configure
vendored
4
src/configure
vendored
|
@ -5799,7 +5799,7 @@ case $OS in
|
|||
fi
|
||||
;;
|
||||
Linux)
|
||||
LIBS="$LIBS -rdynamic"
|
||||
LIBS="$LIBS -ldl -lm -rdynamic"
|
||||
DYN_CFLAGS="-fPIC"
|
||||
GC_THREADS_FLAG="-DGC_LINUX_THREADS"
|
||||
# PPC: X11 librares are not found
|
||||
|
@ -11672,7 +11672,7 @@ if test "${enable_shared}" = "yes" ; then
|
|||
plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/mzscheme/src/schvers.h | cut -d '"' -f 2`
|
||||
fi
|
||||
|
||||
AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} -o"
|
||||
AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o"
|
||||
STATIC_AR="${LIBTOOLPROG} --mode=link --tag=CC $CC -o"
|
||||
ARFLAGS=""
|
||||
RANLIB=":"
|
||||
|
|
|
@ -48,6 +48,7 @@ INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC)
|
|||
CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@
|
||||
CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ $(XLIB)
|
||||
ARLIBFLAGS = $(LDFLAGS) $(LDLIBS)
|
||||
###########################
|
||||
|
||||
MREDLINKER = @MREDLINKER@
|
||||
|
|
|
@ -45,6 +45,7 @@ INC = -I$(PLTSRCDIR)/mzscheme/$(GCDIRECTORY) $(NOGCINC)
|
|||
CXXFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CXXFLAGS@ @PREFLAGS@
|
||||
CFLAGS = $(INC) $(XINCLUDE) $(OPTIONS) -D$(WXVARIANT) @COMPFLAGS@ @PROFFLAGS@ @CFLAGS@ @PREFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ $(XLIB)
|
||||
ARLIBFLAGS = $(LDFLAGS) $(LDLIBS)
|
||||
###########################
|
||||
|
||||
CPP = @CPP@
|
||||
|
@ -1362,7 +1363,7 @@ MREDMZOBJS_a = $(MZOBJS)
|
|||
MREDMZOBJS_la =
|
||||
|
||||
../libmred3m.@LIBSFX@: $(XOBJS) $(MZOBJS) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS)
|
||||
$(AR) $(ARFLAGS) ../libmred3m.@LIBSFX@ $(XOBJS) $(LIBMREDMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBMREDLIBS_@LIBSFX@)
|
||||
$(AR) $(ARFLAGS) ../libmred3m.@LIBSFX@ $(XOBJS) $(LIBMREDMZOBJS_@LIBSFX@) $(@WXVARIANT@_PLAIN_OBJS) $(EXTRA_MZ_OBJS) $(LIBMREDLIBS_@LIBSFX@)
|
||||
$(RANLIB) ../libmred3m.@LIBSFX@
|
||||
|
||||
../mred@MMM@@NOT_OSX@: mrmain.@LTO@ ../libmred3m.@LIBSFX@
|
||||
|
|
|
@ -23,6 +23,8 @@ AR = @AR@
|
|||
ARFLAGS = @ARFLAGS@
|
||||
RANLIB = @RANLIB@
|
||||
|
||||
ARLIBFLAGS = @LDFLAGS@ @LIBS@
|
||||
|
||||
MZSRC = $(srcdir)/src
|
||||
|
||||
FOREIGN_DIR = ../foreign
|
||||
|
|
|
@ -534,7 +534,7 @@ case $OS in
|
|||
fi
|
||||
;;
|
||||
Linux)
|
||||
LIBS="$LIBS -rdynamic"
|
||||
LIBS="$LIBS -ldl -lm -rdynamic"
|
||||
DYN_CFLAGS="-fPIC"
|
||||
GC_THREADS_FLAG="-DGC_LINUX_THREADS"
|
||||
# PPC: X11 librares are not found
|
||||
|
@ -1233,7 +1233,7 @@ if test "${enable_shared}" = "yes" ; then
|
|||
plt_lib_version=`grep " MZSCHEME_VERSION " ${srcdir}/mzscheme/src/schvers.h | cut -d '"' -f 2`
|
||||
fi
|
||||
|
||||
AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} -o"
|
||||
AR="${LIBTOOLPROG} --mode=link --tag=CC $CC${need_gcc_static_libgcc}${ar_libtool_no_undefined} -release ${plt_lib_version} -rpath ${abslibdir} \$(ARLIBFLAGS) -o"
|
||||
STATIC_AR="${LIBTOOLPROG} --mode=link --tag=CC $CC -o"
|
||||
ARFLAGS=""
|
||||
RANLIB=":"
|
||||
|
|
|
@ -22,6 +22,8 @@ CPPFLAGS = @PREFLAGS@ @OPTIONS@ @GC2OPTIONS@ @MZOPTIONS@ -I$(builddir)/.. -I$(sr
|
|||
CFLAGS = @CFLAGS@ $(CPPFLAGS) @COMPFLAGS@ @PROFFLAGS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
ARLIBFLAGS = @LDFLAGS@ $(LIBS)
|
||||
|
||||
DEF_COLLECTS_DIR = +D INITIAL_COLLECTS_DIRECTORY='"'"`cd $(srcdir)/../../../collects; pwd`"'"'
|
||||
|
||||
XFORM_SETUP = ../mzscheme@CGC@ -cqu $(srcdir)/xform.ss --setup .
|
||||
|
|
Loading…
Reference in New Issue
Block a user