X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FGCJ.xml;h=e8b514b1adff064db4b766a62af5e0e03081e40f;hb=a5c5c85a8c0ed30b62113cc007a10bc305926a5b;hp=2f4af1d5e70b5e3120bbbb0852e28d5a75dc3d45;hpb=15a3e1ac3b709d4c756b078e34e6d67f2efbb317;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/GCJ.xml b/src/org/xwt/plat/GCJ.xml
index 2f4af1d..e8b514b 100644
--- a/src/org/xwt/plat/GCJ.xml
+++ b/src/org/xwt/plat/GCJ.xml
@@ -21,7 +21,7 @@
         <gcjh out='bin-${plat}' classpath='bin'/>
 
         <echo message='compiling   .java -> .o'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}'>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}'>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar:src/'/>
             <arg value='-O9'/>
             <arg value='-g'/>
@@ -35,7 +35,7 @@
                 <include name='org/xwt/*.java'/>
                 <include name='org/xwt/util/*.java'/>
                 <include name='org/xwt/plat/GCJ.java'/>
-                <include name='org/xwt/plat/${plat}.java'/>
+                <include name='org/xwt/plat/${subplat}.java'/>
                 <include name='org/bouncycastle/**/*.java'/>
                 <include name='org/mozilla/**/*.java'/>
             </fileset>
@@ -43,19 +43,19 @@
         </apply>
 
         <echo message='compiling     .cc -> .o'/>
-            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' dest='bin-${plat}/'>
+            <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' dest='bin-${plat}/'>
             <arg value='-g'/>
             <arg value='-Ibin-${plat}'/>
             <arg value='-c'/>
             <srcfile/>
             <arg value='-o'/>
             <targetfile/>
-            <fileset dir='src/' includes='org/xwt/plat/${plat}.cc'/>
+            <fileset dir='src/' includes='org/xwt/plat/${subplat}.cc'/>
             <mapper type='glob' from='*.cc' to='*-nat.o'/>
         </apply>
                                                                               
-                                                                                      <echo message='linking        .o -> ${binaryname}'/>
-        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}-gcj' parallel='true'>
+        <echo message='linking        .o -> ${binaryname}'/>
+        <apply failonerror='true' executable='${gcc-path}/bin/${gcc-target}gcj' parallel='true'>
             <fileset dir='bin-${plat}/' includes='**/*.o' excludes='*.o'/>
             <arg value='-fCLASSPATH=${gcc-path}/share/libgcj.jar'/>
             <arg value='--main=org.xwt.Main'/>