diff options
| author | William Deegan <bill@baddogconsulting.com> | 2019-12-10 16:19:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 16:19:00 (GMT) |
| commit | 392d323e36bf8c80c7a6d43160148359cfae8ff6 (patch) | |
| tree | 17e49e86ee1ac1d6ebbc43227dc411b899aceab7 /src | |
| parent | 9fe5b8fadd6aede35fd9e057d2cf791f57108f65 (diff) | |
| parent | 2e2ba90baa24a9919000edbf688c306e2c428fb6 (diff) | |
| download | SCons-392d323e36bf8c80c7a6d43160148359cfae8ff6.zip SCons-392d323e36bf8c80c7a6d43160148359cfae8ff6.tar.gz SCons-392d323e36bf8c80c7a6d43160148359cfae8ff6.tar.bz2 | |
Merge pull request #3473 from kulikjak/master
Fix incorrect testing assumptions for Solaris
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/ActionTests.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vc.py | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py index 3054368..3303750 100644 --- a/src/engine/SCons/ActionTests.py +++ b/src/engine/SCons/ActionTests.py @@ -1208,10 +1208,6 @@ class CommandActionTestCase(unittest.TestCase): # Newer cygwin seems to return 126 for following expect_nonexecutable_file = 126 expect_nonexecutable_dir = 127 - elif sys.platform.find('sunos') != -1: - expect_nonexistent = 1 - expect_nonexecutable_file = 1 - expect_nonexecutable_dir = 1 else: expect_nonexistent = 127 expect_nonexecutable_file = 126 diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py index 4f6048d..86bdbe0 100644 --- a/src/engine/SCons/Tool/MSCommon/vc.py +++ b/src/engine/SCons/Tool/MSCommon/vc.py @@ -161,11 +161,18 @@ def get_host_target(env): if not host_platform: host_platform = platform.machine() + # Solaris returns i86pc for both 32 and 64 bit architectures + if host_platform == "i86pc": + if platform.architecture()[0] == "64bit": + host_platform = "amd64" + else: + host_platform = "x86" + # Retain user requested TARGET_ARCH req_target_platform = env.get('TARGET_ARCH') debug('get_host_target() req_target_platform:%s'%req_target_platform) - if req_target_platform: + if req_target_platform: # If user requested a specific platform then only try that one. target_platform = req_target_platform else: |