You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2005/08/18 16:44:16 UTC
cvs commit: xml-xalan/c Makefile.incl.in
dmitryh 2005/08/18 07:44:16
Modified: c Makefile.incl.in
Log:
Fix for XALANC-516
Revision Changes Path
1.39 +19 -19 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.incl.in 16 Aug 2005 01:06:47 -0000 1.38
+++ Makefile.incl.in 18 Aug 2005 14:44:16 -0000 1.39
@@ -166,7 +166,7 @@
CC1 = $(CC2) $(CXXFLAGS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -qmkshrobj ${LDFLAGS} ${bitstobuildLink}
@@ -224,7 +224,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK_SONAME = -Wl,-soname,$(SO_NAME)
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -255,7 +255,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -283,7 +283,7 @@
endif
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) $(CXXFLAGS) -D${PLATFORM} -shared ${PIC_OPTION} ${LDFLAGS}
LINK = $(CXX) -D${PLATFORM} ${PIC_OPTION} ${LDFLAGS}
@@ -305,7 +305,7 @@
ALLLIBS = ${LIBS}
SHLIBSUFFIX=.sl
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = $(CXX) -b +Z ${LDFLAGS} -Wl,+s
LINK_SONAME = -Wl,+h,${SO_NAME}
LINK = $(CXX) $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS) $(PLATFORM_CXX_COMPILE_OPTIONS) -Wl,+s
@@ -331,7 +331,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC ${LDFLAGS}
LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -342,14 +342,13 @@
PLATFORM_COMPILE_OPTIONS = -KPIC -mt -xs -ptr$(XSL_OBJ_DIR) -features=rtti -D${PLATFORM} -D_REENTRANT
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
- MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
- LINK_SONAME = -h ${SO_NAME}
- MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
+ CC4 = $(CC) $(CCFLAGS) -KPIC -mt -xs -D${PLATFORM} -D_REENTRANT
+ MAKE_SHARED = ${CXX} -D${PLATFORM} -G -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
+ LINK_SONAME = -h ${SO_NAME}
+ MAKE_SHARED_C = ${CC} -D${PLATFORM} -G ${LDFLAGS}
LINK = ${CXX} -D${PLATFORM} -ptr$(XSL_OBJ_DIR) ${LDFLAGS}
- ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib \
- -lc -lgen
+ ALLLIBS = -mt ${LIBS} -L/usr/local/SUNWspro/lib -L/usr/ccs/lib -lc -lgen
endif
SHLIBSUFFIX=.so
@@ -377,7 +376,7 @@
EXTRA_LINK_OPTIONS=-lc
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -shared -fPIC ${LDFLAGS}
LINK = g++ -D${PLATFORM} -fPIC ${LDFLAGS}
@@ -390,16 +389,17 @@
PLATFORM_COMPILE_OPTIONS = -qthreaded -D${PLATFORM} -D_THREAD_SAFE
ALLLIBS = ${LIBS} -L/usr/lib
CC1 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+
ifeq (-DNDEBUG,$(findstring -DNDEBUG,${CXXFLAGS}))
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS) -DNDEBUG
else
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
endif
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- MAKE_SHARED = makeC++SharedLib_r -p 512 -brtl ${LDFLAGS} ${bitstobuildLink}
+ MAKE_SHARED = makeC++SharedLib_r -p 512 ${LDFLAGS} ${bitstobuildLink}
- LINK = $(CXX) -qnotempinc $(CXXFLAGS) -brtl ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS) ${bitstobuildLink}
+ LINK = $(CXX) -qnotempinc $(CXXFLAGS) ${LDFLAGS} $(PLATFORM_COMPILE_OPTIONS) ${bitstobuildLink}
ifeq (${BITSTOBUILD}, 64)
MAKE_SHARED += -X64
@@ -452,7 +452,7 @@
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS)
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
CC5 = $(CXX) $(CXXMSGFLAGS) $(PLATFORM_COMPILE_OPTIONS) {$LDFLAGS}
MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
MAKE_SHARED_MSG = ${CXX} $(CXXMSGFLAGS) -D${PLATFORM} -Wl,dll ${LDFLAGS}
@@ -511,7 +511,7 @@
ALLLIBS = ${LIBS} -L/usr/lib -lm
SHLIBSUFFIX = .so
CC1 = $(CXX) ${CXXFLAGS} $(PLATFORM_COMPILE_OPTIONS) -nocxxstd
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
MAKE_SHARED = ${CXX} ${CXXFLAGS} -shared -D${PLATFORM} -ptr ${XSL_OBJ_DIR}/.cxx_repository -ieee -pthread -std strict_ansi_errors -nocxxstd ${LDFLAGS}
LINK = ${CXX} $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) ${LDFLAGS}
MAKE_SHARED_LOC=$(MAKE_SHARED)
@@ -557,7 +557,7 @@
CC2 = $(CXX) $(PLATFORM_COMPILE_OPTIONS2)
endif
CC3 = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS2)
- CC4 = $(CC) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS)
+ CC4 = $(CC) $(CCFLAGS) $(PLATFORM_COMPILE_OPTIONS)
TO = qwobj
EXTRA_COMPILE_OPTIONS = -I. -g -qTERASPACE="*YES *NOTSIFC" -qSTGMDL="*INHERIT" -DXML_USE_ICONV400_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSSOR_SOCKET -qTGTRLS="V5R1M0"
EXTRA_LINK_OPTIONS = -qOPTION="*DUPPROC *DUPVAR *NOWARN"
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org