mmanders 02/03/08 08:13:26
Modified: jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
MwccCompiler.java
Log:
Updated to support building with LibC for NetWare.
Revision Changes Path
1.7 +4 -1
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MwldLinker.java 16 Nov 2001 22:23:22 -0000 1.6
+++ MwldLinker.java 8 Mar 2002 16:13:26 -0000 1.7
@@ -156,7 +156,10 @@
}
// add the default startup code to the list of objects
- linkOptPw.println(libBase + "\\lib\\nwpre.obj");
+ if (null == project.getProperty("use.novelllibc"))
+ linkOptPw.println(libBase + "\\lib\\nwpre.obj");
+ else
+ linkOptPw.println("-llibcpre.o");
// write the objects to link with to the .opt file
for( int i=0; i<srcList.size(); i++ ) {
1.7 +7 -3
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java
Index: MwccCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MwccCompiler.java 11 Nov 2001 01:09:59 -0000 1.6
+++ MwccCompiler.java 8 Mar 2002 16:13:26 -0000 1.7
@@ -127,10 +127,14 @@
String localCflags=cflags;
File ccOpt = new File(buildDir, "cc.opt");
if( localCflags==null ) {
- localCflags=new String("-nosyspath -c -align 1 -w nocmdline -bool on");
- if( extra_cflags!=null ) {
+ localCflags=new String("-nosyspath -c -w nocmdline -bool on");
+ if (null == project.getProperty("use.novelllibc"))
+ localCflags += " -align 1";
+ else
+ localCflags += " -align 4";
+
+ if( extra_cflags!=null )
localCflags+=" " + extra_cflags;
- }
}
if (optG)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
