diff options
| -rw-r--r-- | SConstruct | 5 | ||||
| -rw-r--r-- | build.txt | 4 |
2 files changed, 3 insertions, 6 deletions
@@ -256,6 +256,7 @@ for (name, default, help) in pathopts: env['VERSION'] = gpsd_version env['PYTHON'] = sys.executable +env['ENV']['PYTHON'] = sys.executable # Also pass it to regress-driver # Set defaults from environment. Note that scons doesn't cope well # with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to @@ -1579,7 +1580,7 @@ else: # SCons to install up to date versions of gpsfake and gpsctl if it can # find older versions of them in a directory on your $PATH. gps_herald = Utility('gps-herald', [gpsd, gpsctl, python_built_extensions], - ':; $PYTHON_COVERAGE $SRCDIR/gpsfake -T') + ':; $PYTHON $PYTHON_COVERAGE $SRCDIR/gpsfake -T') gps_log_pattern = os.path.join('test', 'daemon', '*.log') gps_logs = glob.glob(gps_log_pattern) gps_names = [os.path.split(x)[-1][:-4] for x in gps_logs] @@ -1733,7 +1734,7 @@ if not env['python']: else: maidenhead_locator_regress = Utility('maidenhead-locator-regress', [python_built_extensions], [ '@echo "Testing the Maidenhead Locator conversion..."', - '$PYTHON_COVERAGE $SRCDIR/test_maidenhead.py >/dev/null', + '$PYTHON $PYTHON_COVERAGE $SRCDIR/test_maidenhead.py >/dev/null', ]) # Regression-test the calendar functions @@ -60,10 +60,6 @@ Necessary components for any build: |scons | for executing the build recipe |============================================================================ -Note: There must be a Python 2 interpreter named 'python2' in your path, -or the regression tests will fail. On some systems you might need to -arrange this by putting symlink in a local directory on $PATH. - === C compiler === C99 conformance is required in the compiler. The C code depends on one |