diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 11:48:43 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-08-11 16:45:02 -0700 |
| commit | b6b4f5a0e7a98d918d7c5a56e291c0063f257f1e (patch) | |
| tree | 57ae604ac7138ac138d63cc38ed82ad4194d03a0 /src/etc | |
| parent | 91c618f133a35ffccc7e03e06f9318c59d091ae3 (diff) | |
trans: Re-enable unwinding on 64-bit MSVC
This commit leverages the runtime support for DWARF exception info added in #27210 to enable unwinding by default on 64-bit MSVC. This also additionally adds a few minor fixes here and there in the test harness and such to get `make check` entirely passing on 64-bit MSVC: * The invocation of `maketest.py` now works with spaces/quotes in CC * debuginfo tests are disabled on MSVC * A link error for librustc was hacked around (see #27438)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/maketest.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/etc/maketest.py b/src/etc/maketest.py index f500de5e15d..04bf81a96aa 100644 --- a/src/etc/maketest.py +++ b/src/etc/maketest.py @@ -41,14 +41,14 @@ def convert_path_spec(name, value): make = sys.argv[2] putenv('RUSTC', os.path.abspath(sys.argv[3])) putenv('TMPDIR', os.path.abspath(sys.argv[4])) -putenv('CC', sys.argv[5]) -putenv('RUSTDOC', os.path.abspath(sys.argv[6])) -filt = sys.argv[7] -putenv('LD_LIB_PATH_ENVVAR', sys.argv[8]) -putenv('HOST_RPATH_DIR', os.path.abspath(sys.argv[9])) -putenv('TARGET_RPATH_DIR', os.path.abspath(sys.argv[10])) -putenv('RUST_BUILD_STAGE', sys.argv[11]) -putenv('S', os.path.abspath(sys.argv[12])) +putenv('CC', sys.argv[5] + ' ' + sys.argv[6]) +putenv('RUSTDOC', os.path.abspath(sys.argv[7])) +filt = sys.argv[8] +putenv('LD_LIB_PATH_ENVVAR', sys.argv[9]) +putenv('HOST_RPATH_DIR', os.path.abspath(sys.argv[10])) +putenv('TARGET_RPATH_DIR', os.path.abspath(sys.argv[11])) +putenv('RUST_BUILD_STAGE', sys.argv[12]) +putenv('S', os.path.abspath(sys.argv[13])) putenv('PYTHON', sys.executable) if filt not in sys.argv[1]: |