summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--SConstruct30
-rw-r--r--src/sim/main.cc17
2 files changed, 33 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct
index 2e4f48180..63858dc2b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -62,8 +62,13 @@
import sys
import os
-# Check for recent-enough Python and SCons versions
-EnsurePythonVersion(2,3)
+# Check for recent-enough Python and SCons versions. If your system's
+# default installation of Python is not recent enough, you can use a
+# non-default installation of the Python interpreter by either (1)
+# rearranging your PATH so that scons finds the non-default 'python'
+# first or (2) explicitly invoking an alternative interpreter on the
+# scons script, e.g., "/usr/local/bin/python2.4 `which scons` [args]".
+EnsurePythonVersion(2,4)
# Ironically, SCons 0.96 dies if you give EnsureSconsVersion a
# 3-element version number.
@@ -169,11 +174,22 @@ if sys.platform == 'cygwin':
env.Append(CCFLAGS=Split("-Wno-uninitialized"))
env.Append(CPPPATH=[Dir('ext/dnet')])
-# Environment args for linking in Python interpreter.
-# Should really have an option for setting the version instead of
-# having 2.4 hardwired in here...
-env.Append(CPPPATH='/usr/include/python2.4')
-env.Append(LIBS='python2.4')
+# Find Python include and library directories for embedding the
+# interpreter. For consistency, we will use the same Python
+# installation used to run scons (and thus this script). If you want
+# to link in an alternate version, see above for instructions on how
+# to invoke scons with a different copy of the Python interpreter.
+
+# Get brief Python version name (e.g., "python2.4") for locating
+# include & library files
+py_version_name = 'python' + sys.version[:3]
+
+# include path, e.g. /usr/local/include/python2.4
+env.Append(CPPPATH = os.path.join(sys.exec_prefix, 'include', py_version_name))
+env.Append(LIBS = py_version_name)
+# add library path too if it's not in the default place
+if sys.exec_prefix != '/usr':
+ env.Append(LIBPATH = os.path.join(sys.exec_prefix, 'lib'))
# Other default libraries
env.Append(LIBS=['z'])
diff --git a/src/sim/main.cc b/src/sim/main.cc
index a4e8a1f77..430dd8f3a 100644
--- a/src/sim/main.cc
+++ b/src/sim/main.cc
@@ -146,8 +146,6 @@ echoCommandLine(int argc, char **argv, ostream &out)
out << endl << endl;
}
-#include "config/python_build_env.hh"
-
int
main(int argc, char **argv)
{
@@ -171,20 +169,25 @@ main(int argc, char **argv)
// Set Python module path to include current file to find embedded
// zip archive
- PyRun_SimpleString("import sys");
+ if (PyRun_SimpleString("import sys") != 0)
+ panic("Python error importing 'sys' module\n");
string pathCmd = csprintf("sys.path[1:1] = ['%s']", fileName);
- PyRun_SimpleString(pathCmd.c_str());
+ if (PyRun_SimpleString(pathCmd.c_str()) != 0)
+ panic("Python error setting sys.path\n");
// Pass compile timestamp string to Python
extern const char *compileDate; // from date.cc
string setCompileDate = csprintf("compileDate = '%s'", compileDate);
- PyRun_SimpleString(setCompileDate.c_str());
+ if (PyRun_SimpleString(setCompileDate.c_str()) != 0)
+ panic("Python error setting compileDate\n");
// PyRun_InteractiveLoop(stdin, "stdin");
// m5/__init__.py currently contains main argv parsing loop etc.,
// and will write out config.ini file before returning.
- PyImport_ImportModule("defines");
- PyImport_ImportModule("m5");
+ if (PyImport_ImportModule("defines") == NULL)
+ panic("Python error importing 'defines.py'\n");
+ if (PyImport_ImportModule("m5") == NULL)
+ panic("Python error importing 'm5' module\n");
Py_Finalize();
configStream = simout.find("config.out");