Return-Path: 
 <commits-return-26758-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 68836 invoked from network); 29 Jan 2007 10:23:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Jan 2007 10:23:18 -0000
Received: (qmail 46395 invoked by uid 500); 29 Jan 2007 10:23:24 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 46369 invoked by uid 500); 29 Jan 2007 10:23:24 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 46360 invoked by uid 99); 29 Jan 2007 10:23:24 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jan 2007 02:23:24 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Jan 2007 02:23:17 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id BFFBD1A981A; Mon, 29 Jan 2007 02:22:57 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r500998 -
 /harmony/enhanced/drlvm/trunk/build/make/build.xml
Date: Mon, 29 Jan 2007 10:22:57 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070129102257.BFFBD1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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}">