You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2008/09/04 14:52:12 UTC
svn commit: r691997 -
/harmony/enhanced/common_resources/trunk/make/properties.xml
Author: hindessm
Date: Thu Sep 4 05:52:12 2008
New Revision: 691997
URL: http://svn.apache.org/viewvc?rev=691997&view=rev
Log:
Use platform variant support to handle freebsd differences too.
Modified:
harmony/enhanced/common_resources/trunk/make/properties.xml
Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=691997&r1=691996&r2=691997&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Thu Sep 4 05:52:12 2008
@@ -69,12 +69,17 @@
<property name="hy.test.timeout" value="900000" />
<property name="hy.test.vmargs" value="" />
- <condition property="hy.libstdc++.suffix" value=".libstdc++6">
+ <condition property="hy.platform.suffix" value=".libstdc++6">
<isset property="use.libstdc++6"/>
</condition>
- <property name="hy.libstdc++.suffix" value="" />
+ <condition property="hy.platform.suffix" value=".7x">
+ <!-- matches would be better but debian stable has ant 1.6.5
+ and matches was only added to 1.7.0 and above -->
+ <contains substring="7." string="${os.version}"/>
+ </condition>
+ <property name="hy.platform.suffix" value="" />
<property name="hy.platform.variant"
- value="${hy.platform}${hy.libstdc++.suffix}" />
+ value="${hy.platform}${hy.platform.suffix}" />
<condition property="png.home" value="/usr/local">
<isset property="is.freebsd"/>