You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/03/30 12:02:12 UTC

svn commit: r524019 - in /harmony/enhanced/jdktools/trunk/make: defines.mk properties.xml

Author: apetrenko
Date: Fri Mar 30 03:02:08 2007
New Revision: 524019

URL: http://svn.apache.org/viewvc?view=rev&rev=524019
Log:
Patch for HARMONY-3529 "[jdktools][build] fix GCC problem with handling C++ exceptions"

Modified:
    harmony/enhanced/jdktools/trunk/make/defines.mk
    harmony/enhanced/jdktools/trunk/make/properties.xml

Modified: harmony/enhanced/jdktools/trunk/make/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/defines.mk?view=diff&rev=524019&r1=524018&r2=524019
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/defines.mk (original)
+++ harmony/enhanced/jdktools/trunk/make/defines.mk Fri Mar 30 03:02:08 2007
@@ -29,7 +29,8 @@
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
 SHAREDSUB=../shared/
 
-HYCOMMONFLAGS = -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -D$(HY_ARCH_DEFINE) \
+HYCOMMONFLAGS = -fpic \
+                -DLINUX -D_REENTRANT -DIPv6_FUNCTION_SUPPORT -D$(HY_ARCH_DEFINE) \
                 -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
 
 ifndef HYDEBUGCFLAGS

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?view=diff&rev=524019&r1=524018&r2=524019
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Fri Mar 30 03:02:08 2007
@@ -126,15 +126,6 @@
         <equals arg1="${hy.arch}" arg2="ia64"/>
     </condition>
 
-    <!-- use native compiler option "-fpic" on 64-bit linux/unix platforms -->
-    <condition property="hy.cflags" value="-fpic">
-        <and>
-            <isset property="is.64bit"/>
-            <not>
-                <isset property="is.windows"/>
-            </not>
-        </and>
-    </condition>
     <!-- use native compiler option "-march=pentium3" on 32-bit linux/unix platform -->
     <condition property="hy.cflags" value="-march=pentium3">
         <and>