From: Bobby R. Bruce <bbruce@ucdavis.edu>
Date: Mon, 28 Sep 2020 18:23:38 +0000 (-0700)
Subject: scons,python: Add python2-config to PYTHON_CONFIG
X-Git-Tag: v20.1.0.0~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5eb9cdd2c6317922182ec38024d1af13b6c07bb8;p=gem5.git

scons,python: Add python2-config to PYTHON_CONFIG

PYTHON_CONFIG can be python2-config as well as python2.7-config.

Change-Id: I482cb922fcf26b37f67f2aca392e04968ca144bd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/35255
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/SConstruct b/SConstruct
index 316c10b2f..667a0e647 100755
--- a/SConstruct
+++ b/SConstruct
@@ -238,7 +238,8 @@ global_vars.AddVariables(
     ('MARSHAL_CCFLAGS_EXTRA', 'Extra C and C++ marshal compiler flags', ''),
     ('MARSHAL_LDFLAGS_EXTRA', 'Extra marshal linker flags', ''),
     ('PYTHON_CONFIG', 'Python config binary to use',
-     [ 'python3-config', 'python-config', 'python2.7-config' ]),
+     [ 'python3-config', 'python-config', 'python2.7-config', 'python2-config']
+    ),
     ('PROTOC', 'protoc tool', environ.get('PROTOC', 'protoc')),
     ('BATCH', 'Use batch pool for build and tests', False),
     ('BATCH_CMD', 'Batch pool submission command name', 'qdo'),