From 17e505e62949ac65850931fecaa4dc26aef992c6 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 13 Apr 2004 11:40:08 +0000
Subject: [PATCH] enable gcj's java -> native compilation.

Submitted by:	Arnaud Vandyck <arnaud dot vandyck at ulg dot ac dot be>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@276301 13f79535-47bb-0310-9956-ffa450edef68
---
 CONTRIBUTORS                                  |  1 +
 WHATSNEW                                      |  5 +++
 .../tools/ant/taskdefs/compilers/Gcj.java     | 33 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 31e2df937..199afb158 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -6,6 +6,7 @@ Andrew Everitt
 Anil K. Vijendran
 Anli Shundi
 Antoine Levy-Lambert
+Arnaud Vandyck
 Arnout J. Kuiper
 Aslak Hellesøy
 Avik Sengupta
diff --git a/WHATSNEW b/WHATSNEW
index 29c841098..004063020 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -105,6 +105,11 @@ Fixed bugs:
 
 * failOnAny attribute for <parallel> was broken. Bugzilla Report 28122.
 
+* If <javac> uses gcj and any of the nested <compilerarg>s implies
+  compilation to native code (like -o or --main), Ant will not pass
+  the -C switch to gcj.  This means you can now compile to native code
+  with gcj which has been impossible in Ant < 1.6.2.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
index 4a05cff05..ed00ef7ab 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
@@ -102,11 +102,42 @@ public class Gcj extends DefaultCompilerAdapter {
 
         /**
          *  gcj should be set for generate class.
+         * ... if no 'compile to native' argument is passed
          */
-        cmd.createArgument().setValue("-C");
+        if (!isNativeBuild()) {
+            cmd.createArgument().setValue("-C");
+        }
 
         addCurrentCompilerArgs(cmd);
 
         return cmd;
     }
+
+    /**
+     * Whether any of the arguments given via &lt;compilerarg&gt;
+     * implies that compilation to native code is requested.
+     *
+     * @since Ant 1.6.2
+     */
+    public boolean isNativeBuild() {
+        boolean nativeBuild = false;
+        String[] additionalArguments = getJavac().getCurrentCompilerArgs();
+        int argsLength=0;
+        while (!nativeBuild && argsLength < additionalArguments.length) {
+            int conflictLength = 0;
+            while (!nativeBuild 
+                   && conflictLength < CONFLICT_WITH_DASH_C.length) {
+                nativeBuild = (additionalArguments[argsLength].startsWith
+                               (CONFLICT_WITH_DASH_C[conflictLength]));
+                conflictLength++;
+            }
+            argsLength++;
+        }
+        return nativeBuild;
+    }
+
+    private static final String [] CONFLICT_WITH_DASH_C = { 
+        "-o" , "--main=", "-D", "-fjni", "-L" 
+    };
+
 }