svn commit: r1568372 - /incubator/log4cxx/trunk/src/ant/apr-build.xml

[ts...@apache.org]

Author: tschoening
Date: Fri Feb 14 17:30:05 2014
New Revision: 1568372

URL: http://svn.apache.org/r1568372
Log:
Workaround for apr_atomic.c and VS2013 needed.

Modified:
    incubator/log4cxx/trunk/src/ant/apr-build.xml

Modified: incubator/log4cxx/trunk/src/ant/apr-build.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/ant/apr-build.xml?rev=1568372&r1=1568371&r2=1568372&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/ant/apr-build.xml (original)
+++ incubator/log4cxx/trunk/src/ant/apr-build.xml Fri Feb 14 17:30:05 2014
@@ -63,6 +63,8 @@
 <property	name="lib.prefix"
 			value=""
 />
+<property	environment="env"
+/>
 
 <target	name="usage"
 		description="Displays usage notes on build">
@@ -236,6 +238,17 @@
 					value="setmode"
 			/>
 		</defineset>
+		<!--
+			apr_atomic.c is not linkable in VS2013 x86 and the only somewhat easy workaround was
+			to claim we are not VS2013, which only works because what we use to claim this is not
+			used elsewhere and doesn't seem to introduce any other problems for now.
+
+			https://groups.google.com/forum/#!topic/aprdev/bc1ILvUe-fk
+			https://groups.google.com/forum/#!topic/unimrcp/Iybpn51UYnI
+		 -->
+		<defineset	define="__MINGW32__"
+					if="env.VS120COMNTOOLS"
+		/>
 
 		<compilerarg	value="${pic-option}"
 						if="pic-option"