From: Andreas Hansson <andreas.hansson@arm.com>
Date: Wed, 20 Jun 2012 23:32:42 +0000 (-0400)
Subject: swig: Use SWIG from environment when determining version
X-Git-Tag: stable_2012_06_28~1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c64731af61a2d1b0917e7f09f2ed40569b8c19b6;p=gem5.git

swig: Use SWIG from environment when determining version

This patch fixes a minor issue in the SConstruct where a hardcoded
swig is used instead of the environment SWIG when determining the
version.
---

diff --git a/SConstruct b/SConstruct
index 1b46e4a4c..b33495939 100755
--- a/SConstruct
+++ b/SConstruct
@@ -580,7 +580,7 @@ if not main.has_key('SWIG'):
     Exit(1)
 
 # Check for appropriate SWIG version
-swig_version = readCommand(('swig', '-version'), exception='').split()
+swig_version = readCommand([main['SWIG'], '-version'], exception='').split()
 # First 3 words should be "SWIG Version x.y.z"
 if len(swig_version) < 3 or \
         swig_version[0] != 'SWIG' or swig_version[1] != 'Version':