attempt to fix CCE in windows compiler config.

mbien · Aug 28, 2010 · a68be28 · a68be28
1 parent b2e62b0
commit a68be28
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/make/build.xml b/make/build.xml
@@ -201,27 +201,21 @@
       -->
     <target name="c.configure.win.mingw32" if="isMingW32">
         <echo message="Win.Ming32W" />
-        <linker id="linker.cfg.win32.mingw.joal" extends="linker.cfg.win32.mingw">
+        <property name="java.includes.dir.platform" value="${java.includes.dir.win32}" />
-            <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names -->
-        </linker>
 
         <property name="compiler.cfg.id"  value="compiler.cfg.win32.mingw" />
-        <property name="linker.cfg.id"    value="linker.cfg.win32.mingw.joal" />
+        <property name="linker.cfg.id"    value="linker.cfg.win32.mingw" />
     </target>
 
     <target name="c.configure.win.mingw64" if="isMingW64">
-        <echo message="Win.Ming64W" />
+        <echo message="Win.Ming64W" />      
-        <linker id="linker.cfg.win64.mingw.joal" extends="linker.cfg.win64.mingw">
+        <property name="java.includes.dir.platform" value="${java.includes.dir.win64}" />
-            <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names -->
-        </linker>
 
         <property name="compiler.cfg.id"  value="compiler.cfg.win64.mingw" />
-        <property name="linker.cfg.id"    value="linker.cfg.win64.mingw.joal" />
+        <property name="linker.cfg.id"    value="linker.cfg.win64.mingw" />
     </target>
 
-    <target name="declare.win32" depends="c.configure.win.mingw32,c.configure.win.mingw64" if="isWindows">
+    <target name="declare.win32" depends="c.configure.win.mingw32,c.configure.win.mingw64" if="isWindows"/>
-      <property name="java.includes.dir.platform"           value="${java.includes.dir.win32}" />
-    </target>
 
     <target name="declare.linux.x86" if="isLinux" unless="isLinuxAMD64">
       <echo message="Linux.x86" />