about summary refs log tree commit diff
path: root/src/libsyntax/errors
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-12-09 02:38:57 +0000
committerbors <bors@rust-lang.org>2015-12-09 02:38:57 +0000
commit56a1f51ef0b26acb0d6eb2a7dbe9336f5e942061 (patch)
tree0933efad9061e43d947aa664a18c506bd4a75df2 /src/libsyntax/errors
parent462ec057649e11ce1967b0eea6c0353375c160ea (diff)
parent9b5b2e3f5950ba771defb03b6628e7f88b21c136 (diff)
downloadrust-56a1f51ef0b26acb0d6eb2a7dbe9336f5e942061.tar.gz
rust-56a1f51ef0b26acb0d6eb2a7dbe9336f5e942061.zip
Auto merge of #30208 - pnkfelix:fix-issue-30063, r=alexcrichton
 When given `rustc -C codegen-units=4 --emit=obj`, reset units back to 1.

Fix #30063

Note: while this code is careful to handle the case of mutliple emit types (e.g. `--emit=asm,obj`) by reporting all the emit types that conflict with codegen units in its warnings, an invocation with multiple emit types *and* `-o PATH` will continue to ignore the requested target path (with a warning), as it already does today, since the code that checks for that is further downstream.  (Multiple emit types without `-o PATH` will "work", though it will downgrade codegen-units to 1 just like all the other cases.)

r? @alexcrichton
Diffstat (limited to 'src/libsyntax/errors')
0 files changed, 0 insertions, 0 deletions