You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ga...@apache.org on 2007/08/21 10:21:26 UTC
svn commit: r568014 - in /xerces/c/branches/xerces-2.7:
samples/EnumVal/Makefile.in tests/Makefile.incl
Author: gareth
Date: Tue Aug 21 01:21:26 2007
New Revision: 568014
URL: http://svn.apache.org/viewvc?rev=568014&view=rev
Log:
Add a conition for g++ on Solaris. Thanks to Boris Kolpackov.
Modified:
xerces/c/branches/xerces-2.7/samples/EnumVal/Makefile.in
xerces/c/branches/xerces-2.7/tests/Makefile.incl
Modified: xerces/c/branches/xerces-2.7/samples/EnumVal/Makefile.in
URL: http://svn.apache.org/viewvc/xerces/c/branches/xerces-2.7/samples/EnumVal/Makefile.in?rev=568014&r1=568013&r2=568014&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/samples/EnumVal/Makefile.in (original)
+++ xerces/c/branches/xerces-2.7/samples/EnumVal/Makefile.in Tue Aug 21 01:21:26 2007
@@ -68,8 +68,13 @@
## SOLARIS
ifeq (${PLATFORM}, SOLARIS)
+ifneq (${GXX}, yes)
$(OUTDIR)/EnumVal.o:: ${SRC}/EnumVal.cpp ${HEADER_FILES}
${CC} ${INCLUDES} ${CMP} -ptr${OUTDIR} -o $(OUTDIR)/EnumVal.o ${SRC}/EnumVal.cpp
+else
+$(OUTDIR)/EnumVal.o:: ${SRC}/EnumVal.cpp ${HEADER_FILES}
+ ${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/EnumVal.o ${SRC}/EnumVal.cpp
+endif
else
$(OUTDIR)/EnumVal.o:: ${SRC}/EnumVal.cpp ${HEADER_FILES}
${CC} ${INCLUDES} ${CMP} -o $(OUTDIR)/EnumVal.o ${SRC}/EnumVal.cpp
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=568014&r1=568013&r2=568014&view=diff
==============================================================================
--- xerces/c/branches/xerces-2.7/tests/Makefile.incl (original)
+++ xerces/c/branches/xerces-2.7/tests/Makefile.incl Tue Aug 21 01:21:26 2007
@@ -116,26 +116,28 @@
#================= AIX SPECIFIC OPTIONS ===========================
ifeq (${PLATFORM}, AIX)
-
-ifeq (${CXXVER}, v5compat)
+ ifeq (${GXX}, yes)
+ CMP= -c ${CXXFLAGS}
+ 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= ${EXTRA_LIBS}
+ else
+ ifeq (${CXXVER}, v5compat)
CMP= -c ${CXXFLAGS} -qnotempinc -qnamemangling=v5
-else
+ else
CMP= -c ${CXXFLAGS} -qnotempinc -qnamemangling=ansi
-endif
-
-CC=${COMPILER} -D${PLATFORM}
-LINK = ${COMPILER} ${LDFLAGS}
+ endif
-ifeq (${BITSTOBUILD}, 64)
+ CC=${COMPILER} -D${PLATFORM}
+ LINK = ${COMPILER} ${LDFLAGS}
+ ifeq (${BITSTOBUILD}, 64)
EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000000
-else
+ else
EXTRA_LINK_OPTIONS=-bmaxdata:0x80000000
-endif
-
-# the compiler knows about this two
-# PLATFORM_LIB_LINK_OPTIONS=-L/usr/lpp/xlC/lib
-# EXTRA_LINK_OPTIONS=-lC ${EXTRA_LIBS}
-SHLIBSUFFIX=.a
+ endif
+ endif
+ SHLIBSUFFIX=.a
endif
#=============== OS400 SPECIFIC OPTIONS =========================
@@ -257,6 +259,13 @@
#================= HP SPECIFIC OPTIONS ===========================
ifeq (${PLATFORM}, HPUX)
+ ifeq (${GXX}, yes)
+ CMP= -c ${CXXFLAGS}
+ 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= ${EXTRA_LIBS}
+ else
ifeq (${COMPILER}, aCC)
ifeq (${CXXVER}, aCC05)
CMP = -c +DAportable $(CXXFLAGS) -D_HP_UX -DHPaCC -w +z -mt
@@ -272,8 +281,6 @@
else
PLATFORM_LIB_LINK_OPTIONS=-L/opt/aCC/lib -L/usr/ccs/lib -lpthread
endif
-
- SHLIBSUFFIX=.sl
else
ifneq (${DEBUG}, 1)
CXXFLAGS = -w +O1
@@ -286,8 +293,9 @@
CC = CC
LINK = ${CC} $(COMMON_CMP) -Wl,+s -Wl,+b,. ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/opt/CC/lib -L/usr/lib
- SHLIBSUFFIX=.sl
endif
+ endif
+ SHLIBSUFFIX=.sl
endif
#================= OS390 SPECIFIC OPTIONS ===========================
@@ -366,8 +374,8 @@
#=============== MacOS SPECIFIC OPTIONS =========================
ifeq (${PLATFORM}, MACOSX)
CMP= -c ${CXXFLAGS}
- CC= c++ -c -D${PLATFORM} -D_REENTRANT
- LINK = c++ -D${PLATFORM} ${LDFLAGS}
+ CC= ${COMPILER} -c -D${PLATFORM} -D_REENTRANT
+ LINK = ${COMPILER} -D${PLATFORM} ${LDFLAGS}
PLATFORM_LIB_LINK_OPTIONS=-L/usr/lib
SHLIBSUFFIX=.dylib
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org