You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/01/18 20:40:55 UTC
cvs commit: xml-xerces/c/samples Makefile.incl runConfigure
tng 02/01/18 11:40:55
Modified: c/samples Makefile.incl runConfigure
Log:
[Bug 5371] runConfigure extra linker options ignored in Makefiles for tests and samples.
Revision Changes Path
1.37 +14 -14 xml-xerces/c/samples/Makefile.incl
Index: Makefile.incl
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/Makefile.incl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.incl 21 Dec 2001 18:25:05 -0000 1.36
+++ Makefile.incl 18 Jan 2002 19:40:55 -0000 1.37
@@ -54,7 +54,7 @@
# <http://www.apache.org/>.
#
#
-# $Id: Makefile.incl,v 1.36 2001/12/21 18:25:05 tng Exp $
+# $Id: Makefile.incl,v 1.37 2002/01/18 19:40:55 tng Exp $
#
################## LIBRARY NAMES AND DIRECTORIES ##################
@@ -82,13 +82,13 @@
ifeq (${COMPILER}, g++)
CMP= -c ${CXXFLAGS}
CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
- LINK = g++ -D${PLATFORM} -fpic
+ LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
EXTRA_LINK_OPTIONS=-lc
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT -I/usr/local/include
- LINK = CC -D${PLATFORM}
+ LINK = CC -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=
EXTRA_LINK_OPTIONS=
endif
@@ -117,7 +117,7 @@
ifeq (${PLATFORM}, UNIXWARE)
CMP= -O2 -c ${CXXFLAGS} -pthread
CC= g++ -O2 -c -D${PLATFORM} -D_REENTRANT -fpic -pthread
- LINK = g++ -D${PLATFORM} -fpic -pthread
+ LINK = g++ -D${PLATFORM} -fpic -pthread ${LDFLAGS}
EXTRA_LINK_OPTIONS=-lc -lsocket
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.so
@@ -128,7 +128,7 @@
COMPILESWITCH= -KPIC -Kthread -DPTX -w -O
CMP = -c ${COMPILESWITCH}
CC= c++
-LINK = ${CC} -DPTX -Kthread
+LINK = ${CC} -DPTX -Kthread ${LDFLAGS}
PLATFORM_CPP_COMPILER = c++
PLATFORM_C_COMPILER = cc
PLATFORM_LIBRARIES =
@@ -144,7 +144,7 @@
ifeq (${PLATFORM}, AIX)
CMP= -c ${CXXFLAGS} -qnotempinc
CC=${COMPILER} -D${PLATFORM}
-LINK = ${COMPILER}
+LINK = ${COMPILER} ${LDFLAGS}
# the compiler knows about this two
# PLATFORM_LIB_LINK_OPTIONS=-L/usr/lpp/xlC/lib
# EXTRA_LINK_OPTIONS=-lC
@@ -158,7 +158,7 @@
TO = qwobj
else
MYCC = icc
-LINK = ${CC} -v
+LINK = ${CC} -v ${LDFLAGS}
endif
CMP= -c -DOS400 ${CXXFLAGS}
CXX = $(MYCC)
@@ -172,7 +172,7 @@
ifeq (${PLATFORM}, LINUX)
CMP= -c ${CXXFLAGS}
CC= g++ -c -D${PLATFORM} -D_REENTRANT -fpic
-LINK = g++ -D${PLATFORM} -fpic
+LINK = g++ -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
EXTRA_LINK_OPTIONS=-lc
SHLIBSUFFIX=.so
@@ -182,7 +182,7 @@
ifeq (${PLATFORM}, FREEBSD)
CMP= -c ${CXXFLAGS}
CC= g++ -c -D${PLATFORM} -fPIC
- LINK = g++ -D${PLATFORM} -fPIC
+ LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
ifdef ICUROOT
PLATFORM_LIB_LINK_OPTIONS=-L$(ICUROOT)
EXTRA_LINK_OPTIONS=-licudata -lstdc++ -pthread
@@ -198,7 +198,7 @@
ifeq (${COMPILER}, aCC)
CMP = -c $(CXXFLAGS) -D_HP_UX -DHPaCC +DAportable -w +z
CC = aCC
- LINK = ${CC} -Wl,+s
+ LINK = ${CC} -Wl,+s ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/opt/aCC/lib -L/usr/ccs/lib
SHLIBSUFFIX=.sl
else
@@ -211,7 +211,7 @@
-ptr$(TEMPLATESDIR)
CMP = -c $(COMMON_CMP)
CC = CC
- LINK = ${CC} $(COMMON_CMP) -Wl,+s
+ LINK = ${CC} $(COMMON_CMP) -Wl,+s ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/opt/CC/lib -L/usr/lib
SHLIBSUFFIX=.sl
endif
@@ -248,7 +248,7 @@
else
CC = _CXX_CXXSUFFIX="cpp" _CXX_STEPS="-1" c++ -W0,"langlvl(extended)" -DOS390 -DOPEN_THREADS -D_XOPEN_SOURCE_EXTENDED
endif
-LINK = ${CC}
+LINK = ${CC} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=
EXTRA_LINK_OPTIONS =
SHLIBSUFFIX=.dll
@@ -267,7 +267,7 @@
ifeq (${PLATFORM}, TRU64)
CMP= -c ${CXXFLAGS}
CC = ${COMPILER} -c -D${PLATFORM}
-LINK = ${COMPILER} -D${PLATFORM}
+LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.so
endif
@@ -277,7 +277,7 @@
ifeq (${PLATFORM}, MACOSX)
CMP= -c ${CXXFLAGS}
CC= c++ -c -D${PLATFORM} -D_REENTRANT
- LINK = c++ -D${PLATFORM}
+ LINK = c++ -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
SHLIBSUFFIX=.dylib
endif
1.25 +3 -3 xml-xerces/c/samples/runConfigure
Index: runConfigure
===================================================================
RCS file: /home/cvs/xml-xerces/c/samples/runConfigure,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- runConfigure 22 Dec 2001 14:17:06 -0000 1.24
+++ runConfigure 18 Jan 2002 19:40:55 -0000 1.25
@@ -56,7 +56,7 @@
#
#
-# $Id: runConfigure,v 1.24 2001/12/22 14:17:06 jasons Exp $
+# $Id: runConfigure,v 1.25 2002/01/18 19:40:55 tng Exp $
#
#
@@ -235,11 +235,11 @@
# gcc crashes if optimisation is turned on in a Tru64 environment
if [ $platform = "tru64" -a $CXX = "g++" ]; then
CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]*//g'`
- CFLAGS=`echo $CXXFLAGS | sed -e 's/-O[0-9]*//g'`
+ CFLAGS=`echo $CFLAGS | sed -e 's/-O[0-9]*//g'`
export CXXFLAGS CFLAGS
fi
-LDFLAGS="$linkeroptions"; export LDFLAGS
+LDFLAGS="$LDFLAGS $linkeroptions"; export LDFLAGS
echo
rm -f config.cache
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org