зеркало из https://github.com/mozilla/gecko-dev.git
Bug 461270: Upgraded NSPR to NSPR_HEAD_20090210: linking NSPR
shared libraries should use LDFLAGS.
This commit is contained in:
Wan-Teh Chang
Родитель
4bbd7fafcc
Коммит
437aae9049
|
|
@ -349,7 +349,7 @@ ifeq ($(OS_TARGET), OpenVMS)
|
|||
fi; \
|
||||
fi
|
||||
endif # OpenVMS
|
||||
$(MKSHLIB) $(OBJS) $(RES) $(EXTRA_LIBS)
|
||||
$(MKSHLIB) $(OBJS) $(RES) $(LDFLAGS) $(EXTRA_LIBS)
|
||||
endif # WINNT && !GCC
|
||||
endif # AIX 4.1
|
||||
ifdef ENABLE_STRIP
|
||||
|
|
|
|||
|
|
@ -3432,8 +3432,7 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1;
|
|||
MACOS_SDK_LIBS="-Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
fi
|
||||
|
||||
LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
|
||||
DSO_LDOPTS="${MACOS_SDK_LIBS} $DSO_LDOPTS"
|
||||
LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
|
||||
export NEXT_ROOT=$MACOS_SDK_DIR
|
||||
|
||||
if test -n "$CROSS_COMPILE" ; then
|
||||
|
|
@ -3445,12 +3444,10 @@ tools are selected during the Xcode/Developer Tools installation." 1>&2; exit 1;
|
|||
|
||||
CPP="$CPP -isysroot ${MACOS_SDK_DIR}"
|
||||
|
||||
if test "$GCC_VERSION_FULL" != "4.0.0" ; then
|
||||
if test "$GCC_VERSION_FULL" != "4.0.0" ; then
|
||||
LDFLAGS="$LDFLAGS -isysroot ${MACOS_SDK_DIR}"
|
||||
DSO_LDOPTS="$DSO_LDOPTS -isysroot ${MACOS_SDK_DIR}"
|
||||
else
|
||||
LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -4503,7 +4500,7 @@ EOF
|
|||
AR_FLAGS='c $@'
|
||||
MDCPUCFG_H=_openvms.cfg
|
||||
PR_MD_CSRCS=openvms.c
|
||||
DSO_LDOPTS='-shared -auto_symvec $(LDFLAGS)'
|
||||
DSO_LDOPTS='-shared -auto_symvec'
|
||||
if test -n "$MOZ_DEBUG"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS $_DEBUG_FLAGS"
|
||||
else
|
||||
|
|
@ -4546,17 +4543,17 @@ EOF
|
|||
_OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"
|
||||
ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
|
||||
echo "configure:4550: checking for machine/builtins.h" >&5
|
||||
echo "configure:4547: checking for machine/builtins.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4555 "configure"
|
||||
#line 4552 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -5045,7 +5042,7 @@ EOF
|
|||
CXXFLAGS="$CFLAGS -Wall -Zomf"
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
DSO_CFLAGS=
|
||||
DSO_LDOPTS='-Zomf -Zdll -Zmap'
|
||||
DSO_LDOPTS='-Zomf -Zdll'
|
||||
LDFLAGS='-Zmap'
|
||||
_OPTIMIZE_FLAGS="-O2 -s"
|
||||
_DEBUG_FLAGS="-g -fno-inline"
|
||||
|
|
@ -5056,7 +5053,6 @@ EOF
|
|||
IMPLIB='emximp -o'
|
||||
FILTER='emxexp -o'
|
||||
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Zhigh-mem"
|
||||
LDFLAGS="$LDFLAGS -Zhigh-mem"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define MOZ_OS2_HIGH_MEMORY 1
|
||||
|
|
@ -5086,7 +5082,7 @@ case $target in
|
|||
;;
|
||||
*)
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:5090: checking for dlopen in -ldl" >&5
|
||||
echo "configure:5086: checking for dlopen in -ldl" >&5
|
||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -5094,7 +5090,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5098 "configure"
|
||||
#line 5094 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -5105,7 +5101,7 @@ int main() {
|
|||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -5122,17 +5118,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|||
echo "$ac_t""yes" 1>&6
|
||||
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
|
||||
echo "configure:5126: checking for dlfcn.h" >&5
|
||||
echo "configure:5122: checking for dlfcn.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5131 "configure"
|
||||
#line 5127 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <dlfcn.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -5165,13 +5161,13 @@ esac
|
|||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
||||
echo "configure:5169: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:5165: checking whether ${CC-cc} needs -traditional" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_pattern="Autoconf.*'x'"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5175 "configure"
|
||||
#line 5171 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
|
|
@ -5189,7 +5185,7 @@ rm -f conftest*
|
|||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5193 "configure"
|
||||
#line 5189 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
|
|
@ -5213,12 +5209,12 @@ fi
|
|||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:5217: checking for $ac_func" >&5
|
||||
echo "configure:5213: checking for $ac_func" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5222 "configure"
|
||||
#line 5218 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -5241,7 +5237,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:5241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_$ac_func=yes"
|
||||
else
|
||||
|
|
@ -5282,7 +5278,7 @@ hpux*)
|
|||
if test -z "$GNU_CC"; then
|
||||
|
||||
echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
|
||||
echo "configure:5286: checking for +Olit support" >&5
|
||||
echo "configure:5282: checking for +Olit support" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -5321,7 +5317,7 @@ darwin*)
|
|||
*)
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:5325: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:5321: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5343,7 +5339,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:5347: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:5343: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5365,7 +5361,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:5369: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:5365: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5387,7 +5383,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:5391: checking for pthread_create in -lc" >&5
|
||||
echo "configure:5387: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5519,7 +5515,7 @@ if test -n "$USE_PTHREADS"; then
|
|||
rm -f conftest*
|
||||
ac_cv_have_dash_pthread=no
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
|
||||
echo "configure:5523: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:5519: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo 'int main() { return 0; }' | cat > conftest.c
|
||||
${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
|
||||
if test $? -eq 0; then
|
||||
|
|
@ -5542,7 +5538,7 @@ echo "configure:5523: checking whether ${CC-cc} accepts -pthread" >&5
|
|||
ac_cv_have_dash_pthreads=no
|
||||
if test "$ac_cv_have_dash_pthread" = "no"; then
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
|
||||
echo "configure:5546: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:5542: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo 'int main() { return 0; }' | cat > conftest.c
|
||||
${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
|
||||
if test $? -eq 0; then
|
||||
|
|
|
|||
|
|
@ -1101,11 +1101,7 @@ tools are selected during the Xcode/Developer Tools installation.])
|
|||
MACOS_SDK_LIBS="-Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
fi
|
||||
|
||||
dnl LDFLAGS is for the utilities built in config (now and
|
||||
dnl nsinstall). DSO_LDOPTS is used when linking shared
|
||||
dnl libraries.
|
||||
LDFLAGS="${MACOS_SDK_LIBS} $LDFLAGS"
|
||||
DSO_LDOPTS="${MACOS_SDK_LIBS} $DSO_LDOPTS"
|
||||
export NEXT_ROOT=$MACOS_SDK_DIR
|
||||
|
||||
if test -n "$CROSS_COMPILE" ; then
|
||||
|
|
@ -1127,19 +1123,14 @@ tools are selected during the Xcode/Developer Tools installation.])
|
|||
dnl has an ld that supports -syslibroot. Don't set
|
||||
dnl NEXT_ROOT because it will be ignored and cause
|
||||
dnl warnings when -syslibroot is specified.
|
||||
dnl
|
||||
dnl Both LDFLAGS and DSO_LDOPTS are set here, see the
|
||||
dnl gcc < 4.0 case for the explanation.
|
||||
if test "$GCC_VERSION_FULL" != "4.0.0" ; then
|
||||
dnl gcc > 4.0.0 will pass -syslibroot to ld automatically
|
||||
dnl based on the -isysroot it receives.
|
||||
LDFLAGS="$LDFLAGS -isysroot ${MACOS_SDK_DIR}"
|
||||
DSO_LDOPTS="$DSO_LDOPTS -isysroot ${MACOS_SDK_DIR}"
|
||||
else
|
||||
dnl gcc 4.0.0 doesn't pass -syslibroot to ld, it needs
|
||||
dnl to be explicit.
|
||||
LDFLAGS="$LDFLAGS -Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Wl,-syslibroot,${MACOS_SDK_DIR}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1860,7 +1851,7 @@ mips-sony-newsos*)
|
|||
AR_FLAGS='c $@'
|
||||
MDCPUCFG_H=_openvms.cfg
|
||||
PR_MD_CSRCS=openvms.c
|
||||
DSO_LDOPTS='-shared -auto_symvec $(LDFLAGS)'
|
||||
DSO_LDOPTS='-shared -auto_symvec'
|
||||
if test -n "$MOZ_DEBUG"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS $_DEBUG_FLAGS"
|
||||
else
|
||||
|
|
@ -2196,7 +2187,7 @@ mips-sony-newsos*)
|
|||
CXXFLAGS="$CFLAGS -Wall -Zomf"
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
DSO_CFLAGS=
|
||||
DSO_LDOPTS='-Zomf -Zdll -Zmap'
|
||||
DSO_LDOPTS='-Zomf -Zdll'
|
||||
LDFLAGS='-Zmap'
|
||||
_OPTIMIZE_FLAGS="-O2 -s"
|
||||
_DEBUG_FLAGS="-g -fno-inline"
|
||||
|
|
@ -2207,7 +2198,6 @@ mips-sony-newsos*)
|
|||
IMPLIB='emximp -o'
|
||||
FILTER='emxexp -o'
|
||||
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Zhigh-mem"
|
||||
LDFLAGS="$LDFLAGS -Zhigh-mem"
|
||||
AC_DEFINE(MOZ_OS2_HIGH_MEMORY)
|
||||
fi
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче