[Substrate-commits] SF.net SVN: substrate: [291] trunk
Brought to you by:
landonf
Menu
▾
▴
[Substrate-commits] SF.net SVN: substrate: [291] trunk
|
From: <la...@us...> - 2006-09-01 05:10:00
|
Revision: 291
http://svn.sourceforge.net/substrate/?rev=291&view=rev
Author: landonf
Date: 2006-08-31 22:09:57 -0700 (Thu, 31 Aug 2006)
Log Message:
-----------
Avoid stomping on CFLAGS/LDFLAGS
Modified Paths:
--------------
trunk/Mk/autoconf.mk.in
trunk/platform.m4
Modified: trunk/Mk/autoconf.mk.in
===================================================================
--- trunk/Mk/autoconf.mk.in 2006-09-01 03:53:57 UTC (rev 290)
+++ trunk/Mk/autoconf.mk.in 2006-09-01 05:09:57 UTC (rev 291)
@@ -49,7 +49,7 @@
LIB_FILE = @LIB_FILE@
LDFLAGS_DEBUG = @LDFLAGS_DEBUG@
LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@
-LDFLAGS = @LDFLAGS_DEFAULT@
+LDFLAGS = @LDFLAGS_DEFAULT@ @LDFLAGS@
RANLIB = @RANLIB@
LF_STDINT_INC = @LF_STDINT_INC@
Modified: trunk/platform.m4
===================================================================
--- trunk/platform.m4 2006-09-01 03:53:57 UTC (rev 290)
+++ trunk/platform.m4 2006-09-01 05:09:57 UTC (rev 291)
@@ -447,7 +447,7 @@
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
LD_LIBRARY_PATH_VAR="LIBPATH"
@@ -458,7 +458,7 @@
else
do64bit_ok=yes
EXTRA_CFLAGS="-q64"
- LDFLAGS="-q64"
+ PLATFORM_LDFLAGS="-q64"
RANLIB="${RANLIB} -X64"
AR="${AR} -X64"
SHLIB_LD_FLAGS="-b64"
@@ -486,7 +486,7 @@
SHLIB_CFLAGS=""
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
LD_LIBRARY_PATH_VAR="LIBPATH"
LIB_NEEDS_EXP_FILE=1
LIB_EXPORT_FILE_SUFFIX='${LIB_VERSION}${DBGX}.exp'
@@ -504,7 +504,7 @@
else
do64bit_ok=yes
EXTRA_CFLAGS="-q64"
- LDFLAGS="-q64"
+ PLATFORM_LDFLAGS="-q64"
RANLIB="${RANLIB} -X64"
AR="${AR} -X64"
SHLIB_LD_FLAGS="-b64"
@@ -535,21 +535,21 @@
SHLIB_LD="shlicc -r"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
bsdi4.*)
SHLIB_CFLAGS="-export-dynamic -fPIC"
SHLIB_LD="cc -shared"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS="-export-dynamic"
+ PLATFORM_LDFLAGS="-export-dynamic"
;;
dgux*)
SHLIB_CFLAGS="-K PIC"
SHLIB_LD="cc -G"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
hpux11.*)
# Use updated header definitions where possible
@@ -563,7 +563,7 @@
SHLIB_CFLAGS="+z"
SHLIB_LD="ld -b"
SHLIB_LD_LIBS='${LIBS}'
- LDFLAGS="-Wl,-E"
+ PLATFORM_LDFLAGS="-Wl,-E"
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
if test "$GCC" = "yes" ; then
@@ -593,10 +593,10 @@
do64bit_ok=yes
if test "`uname -m`" = "ia64" ; then
EXTRA_CFLAGS="+DD64"
- LDFLAGS="+DD64 $LDFLAGS"
+ PLATFORM_LDFLAGS="+DD64 $LDFLAGS"
else
EXTRA_CFLAGS="+DA2.0W"
- LDFLAGS="+DA2.0W $LDFLAGS"
+ PLATFORM_LDFLAGS="+DA2.0W $LDFLAGS"
fi
fi
fi
@@ -609,7 +609,7 @@
SHLIB_CFLAGS="+z"
SHLIB_LD="ld -b"
SHLIB_LD_LIBS=""
- LDFLAGS="-Wl,-E"
+ PLATFORM_LDFLAGS="-Wl,-E"
LD_LIBRARY_PATH_VAR="SHLIB_PATH"
fi
;;
@@ -618,7 +618,7 @@
SHLIB_SUFFIX=".a"
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
SHLIB_LD_LIBS='${LIBS}'
- LDFLAGS="-Wl,-D,08000000"
+ PLATFORM_LDFLAGS="-Wl,-D,08000000"
SHARED_LIB_SUFFIX='${LIB_VERSION}${DBGX}.a'
;;
irix5.*)
@@ -627,7 +627,7 @@
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
EXTRA_CFLAGS=""
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
irix6.*)
SHLIB_CFLAGS=""
@@ -636,7 +636,7 @@
SHLIB_SUFFIX=".so"
if test "$GCC" = "yes" ; then
EXTRA_CFLAGS="-mabi=n32"
- LDFLAGS="-mabi=n32"
+ PLATFORM_LDFLAGS="-mabi=n32"
else
case $target_os in
irix6.3)
@@ -647,7 +647,7 @@
EXTRA_CFLAGS="-n32"
;;
esac
- LDFLAGS="-n32"
+ PLATFORM_LDFLAGS="-n32"
fi
;;
irix646.*)
@@ -656,7 +656,7 @@
SHLIB_LD="ld -n32 -shared -rdata_shared"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
# Check to enable 64-bit flags for compiler/linker
@@ -667,7 +667,7 @@
do64bit_ok=yes
SHLIB_LD="ld -64 -shared -rdata_shared"
EXTRA_CFLAGS="-64"
- LDFLAGS="-64"
+ PLATFORM_LDFLAGS="-64"
fi
fi
;;
@@ -677,7 +677,7 @@
SHLIB_SUFFIX=".so"
SHLIB_LD="${CC} -shared"
- LDFLAGS="-rdynamic"
+ PLATFORM_LDFLAGS="-rdynamic"
case $target_cpu in
alpha*)
EXTRA_CFLAGS="-mieee"
@@ -690,7 +690,7 @@
SHLIB_SUFFIX=".so"
SHLIB_LD="${CC} -shared"
- LDFLAGS="-rdynamic"
+ PLATFORM_LDFLAGS="-rdynamic"
case $target_cpu in
alpha*)
EXTRA_CFLAGS="-mieee"
@@ -719,7 +719,7 @@
SHLIB_LD="cc -G"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
MP-RAS-*)
# config.guess doesn't support these systems
@@ -727,16 +727,16 @@
SHLIB_LD="cc -G"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS="-Wl,-Bexport"
+ PLATFORM_LDFLAGS="-Wl,-Bexport"
;;
netbsd*|freebsd[[1-2]].*|openbsd*)
# Not available on all versions: check for include file.
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- LDFLAGS="-rdynamic"
+ PLATFORM_LDFLAGS="-rdynamic"
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
AC_MSG_CHECKING(for ELF)
AC_EGREP_CPP(yes, [
#ifdef __ELF__
@@ -759,12 +759,12 @@
SHLIB_LD="${CC} -shared"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
- LDFLAGS="-export-dynamic"
+ PLATFORM_LDFLAGS="-export-dynamic"
if test "${TCL_THREADS}" = "1" ; then
# The -pthread needs to go in the CFLAGS, not LIBS
LIBS=`echo $LIBS | sed s/-pthread//`
EXTRA_CFLAGS="-pthread"
- LDFLAGS="$LDFLAGS -pthread"
+ PLATFORM_LDFLAGS="$LDFLAGS -pthread"
fi
case $target_os in
freebsd3.*)
@@ -790,7 +790,7 @@
SHLIB_LD="cc -nostdlib -r"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
openedition*)
# IBM OS/390
@@ -804,7 +804,7 @@
SHLIB_LD='ld -R -export $@:'
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
osf1*1.*)
# OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
@@ -816,7 +816,7 @@
fi
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
osf1V*)
# Digital OSF/1
@@ -828,7 +828,7 @@
fi
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
if test "$GCC" = "yes" ; then
EXTRA_CFLAGS="-mieee"
else
@@ -843,7 +843,7 @@
LIBS="$LIBS -lpthread -lmach -lexc"
else
EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
- LDFLAGS="-pthread"
+ PLATFORM_LDFLAGS="-pthread"
fi
fi
@@ -855,22 +855,22 @@
SHLIB_LD="ld -Bshareable -x"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
riscos*)
SHLIB_CFLAGS="-G 0"
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".a"
- LDFLAGS="-Wl,-D,08000000"
+ PLATFORM_LDFLAGS="-Wl,-D,08000000"
;;
SCO_SV*)
if test "$GCC" = "yes" ; then
SHLIB_CFLAGS="-fPIC -melf"
- LDFLAGS="-melf -Wl,-Bexport"
+ PLATFORM_LDFLAGS="-melf -Wl,-Bexport"
else
SHLIB_CFLAGS="-Kpic -belf"
- LDFLAGS="-belf -Wl,-Bexport"
+ PLATFORM_LDFLAGS="-belf -Wl,-Bexport"
fi
SHLIB_LD="ld -G"
SHLIB_LD_LIBS=""
@@ -881,14 +881,14 @@
SHLIB_LD="cc -G"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
;;
sunos4*)
SHLIB_CFLAGS="-PIC"
SHLIB_LD="ld"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
# SunOS can't handle version numbers with dots in them in library
# specs, like -ltcl7.5, so use -ltcl75 instead. Also, it
@@ -908,7 +908,7 @@
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, [], [Define to use posix thread semantics on Sun OS 5])
SHLIB_CFLAGS="-KPIC"
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
@@ -920,10 +920,10 @@
do64bit_ok=yes
if test "$do64bitVIS" = "yes" ; then
EXTRA_CFLAGS="-xarch=v9a"
- LDFLAGS="-xarch=v9a"
+ PLATFORM_LDFLAGS="-xarch=v9a"
else
EXTRA_CFLAGS="-xarch=v9"
- LDFLAGS="-xarch=v9"
+ PLATFORM_LDFLAGS="-xarch=v9"
fi
fi
else
@@ -947,7 +947,7 @@
SHLIB_SUFFIX=".a"
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r -G 0"
SHLIB_LD_LIBS='${LIBS}'
- LDFLAGS="-Wl,-D,08000000"
+ PLATFORM_LDFLAGS="-Wl,-D,08000000"
if test "$GCC" != "yes" ; then
EXTRA_CFLAGS="-DHAVE_TZSET -std1"
fi
@@ -961,14 +961,14 @@
# that don't grok the -Bexport option. Test that it does.
hold_ldflags=$LDFLAGS
AC_MSG_CHECKING(for ld accepts -Bexport flag)
- LDFLAGS="${LDFLAGS} -Wl,-Bexport"
+ PLATFORM_LDFLAGS="${LDFLAGS} -Wl,-Bexport"
AC_TRY_LINK(, [int i;], found=yes, found=no)
- LDFLAGS=$hold_ldflags
+ PLATFORM_LDFLAGS=$hold_ldflags
AC_MSG_RESULT($found)
if test $found = yes; then
- LDFLAGS="-Wl,-Bexport"
+ PLATFORM_LDFLAGS="-Wl,-Bexport"
else
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
fi
;;
esac
@@ -983,7 +983,7 @@
SHLIB_CFLAGS=""
SHLIB_LD=""
SHLIB_SUFFIX=""
- LDFLAGS=""
+ PLATFORM_LDFLAGS=""
fi
# If we're running gcc, then change the C flags for compiling shared
@@ -1074,6 +1074,8 @@
fi
+ LDFLAGS="$LDFLAGS $PLATFORM_LDFLAGS"
+
AC_SUBST(CFLAGS)
AC_SUBST(CFLAGS_DEBUG)
AC_SUBST(CFLAGS_OPTIMIZE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
