harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r500998 - /harmony/enhanced/drlvm/trunk/build/make/build.xml
Date Mon, 29 Jan 2007 10:22:57 GMT
Author: hindessm
Date: Mon Jan 29 02:22:56 2007
New Revision: 500998

URL: http://svn.apache.org/viewvc?view=rev&rev=500998
Log:
Make build.arch independent of if.lnx since arch should be independent of os.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=500998&r1=500997&r2=500998
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Mon Jan 29 02:22:56 2007
@@ -99,29 +99,18 @@
         <condition property="build.arch" value="ia32">
             <!-- os.arch: different values on Windows and Linux -->
             <or>
-                <and>
-                    <isset property="if.win" />
-                    <equals arg1="${os.arch}" arg2="x86" />
-                </and>
-                <and>
-                    <isset property="if.lnx" />
-                    <equals arg1="${machine.arch}" arg2="i686" />
-                </and>
+                <equals arg1="${os.arch}" arg2="x86" />
+                <equals arg1="${machine.arch}" arg2="i686" />
+                <equals arg1="${machine.arch}" arg2="i386" />
             </or>
         </condition>
 
         <condition property="build.arch" value="ipf">
-            <and>
-                <isset property="if.lnx" />
-                <equals arg1="${machine.arch}" arg2="ia64" />
-            </and>
+            <equals arg1="${machine.arch}" arg2="ia64" />
         </condition>
 
         <condition property="build.arch" value="em64t">
-            <and>
-                <isset property="if.lnx" />
-                <equals arg1="${machine.arch}" arg2="x86_64" />
-            </and>
+            <equals arg1="${machine.arch}" arg2="x86_64" />
         </condition>
 
         <condition property="properties.file" value="${env.properties.file}">



Mime
View raw message