Author: danielsh
Date: Sat Dec 30 01:44:14 2017
New Revision: 1819557
URL: http://svn.apache.org/viewvc?rev=1819557&view=rev
Log:
Follow-up to r1819556:
* build/generator/swig/__init__.py
(Generator.__init__):
Restore a part of build.generator.swig.executable.output()'s implementation
to fix the build on some systems (three buildbots failed).
Modified:
subversion/trunk/build/generator/swig/__init__.py
Modified: subversion/trunk/build/generator/swig/__init__.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/swig/__init__.py?rev=1819557&r1=1819556&r2=1819557&view=diff
==============================================================================
--- subversion/trunk/build/generator/swig/__init__.py (original)
+++ subversion/trunk/build/generator/swig/__init__.py Sat Dec 30 01:44:14 2017
@@ -59,7 +59,12 @@ class Generator:
# Calculate SWIG paths
self.swig_path = swig_path
- self.swig_libdir = subprocess.check_output([self.swig_path,
"-swiglib"]).strip()
+ if os.access(self.swig_path, os.X_OK):
+ # ### TODO: What's the reason for this os.access() check? It was added
+ # ### in r873265 (== r33191).
+ self.swig_libdir = subprocess.check_output([self.swig_path,
"-swiglib"]).strip()
+ else:
+ self.swig_libdir = None
_swigVersion = None
def version(self):
