You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/08/22 16:24:55 UTC
svn commit: r568623 - in /xerces/c/branches/xerces-2.7:
samples/Makefile.incl src/xercesc/Makefile.incl tests/Makefile.incl
Author: amassari
Date: Wed Aug 22 07:24:55 2007
New Revision: 568623
URL: http://svn.apache.org/viewvc?rev=568623&view=rev
Log:
Remove option to explicitly link against libc, it causes crashes with 64 bit compilers. Patch by Boris Kolpackov
Modified:
xerces/c/branches/xerces-2.7/samples/Makefile.incl
xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl
xerces/c/branches/xerces-2.7/tests/Makefile.incl
Modified: xerces/c/branches/xerces-2.7/samples/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/samples/Makefile.incl?rev=568623&r1=568622&r2=568623&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/samples/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/samples/Makefile.incl Wed Aug 22 07:24:55 2007
@@ -50,7 +50,7 @@
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT -I/usr/local/include -no_auto_include
@@ -68,7 +68,7 @@
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -D_REENTRANT -pic
@@ -176,14 +176,14 @@
CC= ${COMPILER} -c -D${PLATFORM}
LINK = ${COMPILER} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.so
else
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.so
endif
endif
Modified: xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl?rev=568623&r1=568622&r2=568623&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/src/xercesc/Makefile.incl Wed Aug 22 07:24:55 2007
@@ -759,13 +759,13 @@
endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -licuuc -licudata -lc -lrt
+ ALLLIBS = ${LIBS} -licuuc -licudata -lrt
else
- ALLLIBS = ${LIBS} -lc -lrt
+ ALLLIBS = ${LIBS} -lrt
endif
ifeq (${MESSAGELOADER}, ICU)
- ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages -lc -lrt
+ ALLLIBS = ${LIBS} -licuuc -licudata -lXercesMessages -lrt
endif
else
@@ -805,14 +805,14 @@
endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
else
ALLLIBS = ${LIBS} -L/usr/lib
endif
ifeq (${MESSAGELOADER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
- -licuuc -licudata -lXercesMessages -lc
+ -licuuc -licudata -lXercesMessages
endif
SHLIBSUFFIX=.dylib
@@ -834,14 +834,14 @@
endif
ifeq (${TRANSCODER}, ICU)
- ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata -lc
+ ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib -licuuc -licudata
else
ALLLIBS = ${LIBS} -L/usr/lib
endif
ifeq (${MESSAGELOADER}, ICU)
ALLLIBS = ${LIBS} -L/usr/lib -L/usr/local/lib -L/usr/ccs/lib \
- -licuuc -licudata -lXercesMessages -lc
+ -licuuc -licudata -lXercesMessages
endif
EXTRA_LINK_OPTIONS = \
Modified: xerces/c/branches/xerces-2.7/tests/Makefile.incl
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/tests/Makefile.incl?rev=568623&r1=568622&r2=568623&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/tests/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/tests/Makefile.incl Wed Aug 22 07:24:55 2007
@@ -50,7 +50,7 @@
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -LANG:pch -LANG:std -O2 -D_REENTRANT -I/usr/local/include -no_auto_include
@@ -68,7 +68,7 @@
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib -L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
else
CMP= -c ${CXXFLAGS}
CC= CC -c -D${PLATFORM} -D_REENTRANT -KPIC
@@ -176,14 +176,14 @@
CC= ${COMPILER} -c -D${PLATFORM}
LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.so
else
CMP= -c ${CXXFLAGS}
CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT -fpic
LINK = ${COMPILER} -D${PLATFORM} -fpic ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib
- EXTRA_LINK_OPTIONS=-lc ${EXTRA_LIBS}
+ EXTRA_LINK_OPTIONS=${EXTRA_LIBS}
SHLIBSUFFIX=.so
endif
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org