From f3dc3495cfa86524f39fb1b86115febbe40383e5 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 13 Nov 2022 08:55:43 -0500 Subject: Remove macports path, update comment to remove python2 related issues --- SCons/Platform/darwin.py | 4 ++-- SCons/Util.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/SCons/Platform/darwin.py b/SCons/Platform/darwin.py index d57f810..dcaf5c8 100644 --- a/SCons/Platform/darwin.py +++ b/SCons/Platform/darwin.py @@ -31,6 +31,7 @@ selection method. from . import posix import os + def generate(env): posix.generate(env) env['SHLIBSUFFIX'] = '.dylib' @@ -40,8 +41,7 @@ def generate(env): # env['ENV']['PATH'] = '/opt/local/bin:/opt/local/sbin:' + env['ENV']['PATH'] + ':/sw/bin' # Store extra system paths in env['ENV']['PATHOSX'] - env['ENV']['PATHOSX'] = '/opt/local/bin' - + filelist = ['/etc/paths',] # make sure this works on Macs with Tiger or earlier try: diff --git a/SCons/Util.py b/SCons/Util.py index a7a6307..33dc0d3 100644 --- a/SCons/Util.py +++ b/SCons/Util.py @@ -2156,9 +2156,7 @@ def sanitize_shell_env(execution_env): value = flatten_sequence(value) new_env[key] = os.pathsep.join(map(str, value)) else: - # It's either a string or something else. If it's a string, - # we still want to call str() because it might be a *Unicode* - # string, which makes subprocess.Popen() gag. If it isn't a + # It's either a string or something else. If it isn't a # string or a list, then we just coerce it to a string, which # is the proper way to handle Dir and File instances and will # produce something reasonable for just about everything else: -- cgit v0.12