Author: mturk
Date: Thu Mar 8 06:27:03 2012
New Revision: 1298276
URL: http://svn.apache.org/viewvc?rev=1298276&view=rev
Log:
Allow overriding CC on make cmdline instead editing Makefile.solaris for
different compilers
Modified:
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/native/netscape/Makefile.solaris
Modified: tomcat/jk/trunk/native/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1298276&r1=1298275&r2=1298276&view=diff
==============================================================================
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Thu Mar 8 06:27:03 2012
@@ -127,10 +127,16 @@
cd netscape
make -f Makefile.solaris
- This assumes that SUITSPOT_HOME is defined and points to
- your SunONE install path (eg: /opt/SUNWwbsvr/plugins)
+ This assumes that IPLANET_HOME is defined and points to
+ your iPlanet install path (eg: /opt/SUNWwbsvr)
and that JAVA_HOME is defined (eg: /opt/SUNWwbsvr/bin/https/jdk).
+ By default GCC will be used. You can use SunCC by providing
+ CC=cc on the make command line:
+
+ make -f Makefile.solaris CC=cc IPLANET_HOME=/opt/SUNWwbsrv70
EXTRA_CFLAGS=-m64
+
+
Misc notes
----------
Modified: tomcat/jk/trunk/native/netscape/Makefile.solaris
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/netscape/Makefile.solaris?rev=1298276&r1=1298275&r2=1298276&view=diff
==============================================================================
--- tomcat/jk/trunk/native/netscape/Makefile.solaris (original)
+++ tomcat/jk/trunk/native/netscape/Makefile.solaris Thu Mar 8 06:27:03 2012
@@ -23,22 +23,22 @@
# 2. statically linking with libgcc
# 3. Adjusting LD_LIBRARY_PATH to grab libgcc_s
CC=gcc
+ifeq (gcc,$(CC))
# For 64 Bit builds, add "-m64" to EXTRA_CFLAGS
-EXTRA_CFLAGS=-fPIC -pthread
+CFLAGS+=-fPIC -pthread
LDFLAGS=-shared
-
-# Sun Studio cc compiler
-#CC=cc
+else
# For 64 Bit builds, add "-xtarget=generic64" to EXTRA_CFLAGS
-#EXTRA_CFLAGS=-xcode=pic32 -mt
-#LDFLAGS=-G
+CFLAGS+=-xcode=pic32 -mt
+LDFLAGS=-G
+endif
# Change this according to location where on installed the server.
# Don't forget to do the ./configure --enable-netscape=/opt/SUNWwbsvr/plugins
# before doing gmake -f Makefile.solaris
CC_CMD=$(CC) $(CFLAGS) $(EXTRA_CFLAGS) \
- -DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
-DJK_NSAPI
+ -DNET_SSL -DSOLARIS -D_REENTRANT -DXP_UNIX -DMCC_HTTPD -DSPAPI20
-DJK_NSAPI -DHAVE_CONFIG_H
LD_SHAREDCMD=$(CC) $(LDFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
