From: Curt A. <ca...@us...> - 2006-03-17 17:26:48
|
Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/hp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18333/src/net/sf/antcontrib/cpptasks/hp Modified Files: aCCCompiler.java Log Message: Patch 1193690: Suppress implied +z when +Z specified for aCCCompiler Index: aCCCompiler.java =================================================================== RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** aCCCompiler.java 24 Apr 2004 20:07:19 -0000 1.9 --- aCCCompiler.java 17 Mar 2006 17:26:39 -0000 1.10 *************** *** 60,64 **** * if (multithreaded) { args.addElement("-mt"); } */ ! if (linkType.isSharedLibrary()) { args.addElement("+z"); } --- 60,68 ---- * if (multithreaded) { args.addElement("-mt"); } */ ! ! // ! // per patch 1193690 ! // ! if (linkType.isSharedLibrary() && (! args.contains("+Z"))) { args.addElement("+z"); } |