Collapse all uses of target.options.foo
into target.foo
with an eye on merging `TargetOptions` into `Target`. `TargetOptions` as a separate structure is mostly an implementation detail of `Target` construction, all its fields logically belong to `Target` and available from `Target` through `Deref` impls.
This commit is contained in:
parent
8a097f7b2c
commit
e9c34b3cf8
5 changed files with 8 additions and 8 deletions
|
@ -63,9 +63,9 @@ impl<'a> ArchiveBuilder<'a> for ArArchiveBuilder<'a> {
|
||||||
sess,
|
sess,
|
||||||
dst: output.to_path_buf(),
|
dst: output.to_path_buf(),
|
||||||
lib_search_paths: archive_search_paths(sess),
|
lib_search_paths: archive_search_paths(sess),
|
||||||
use_gnu_style_archive: sess.target.options.archive_format == "gnu",
|
use_gnu_style_archive: sess.target.archive_format == "gnu",
|
||||||
// FIXME fix builtin ranlib on macOS
|
// FIXME fix builtin ranlib on macOS
|
||||||
no_builtin_ranlib: sess.target.options.is_like_osx,
|
no_builtin_ranlib: sess.target.is_like_osx,
|
||||||
|
|
||||||
src_archives,
|
src_archives,
|
||||||
entries,
|
entries,
|
||||||
|
|
|
@ -50,7 +50,7 @@ impl<'tcx> DebugContext<'tcx> {
|
||||||
// TODO: this should be configurable
|
// TODO: this should be configurable
|
||||||
// macOS doesn't seem to support DWARF > 3
|
// macOS doesn't seem to support DWARF > 3
|
||||||
// 5 version is required for md5 file hash
|
// 5 version is required for md5 file hash
|
||||||
version: if tcx.sess.target.options.is_like_osx {
|
version: if tcx.sess.target.is_like_osx {
|
||||||
3
|
3
|
||||||
} else {
|
} else {
|
||||||
// FIXME change to version 5 once the gdb and lldb shipping with the latest debian
|
// FIXME change to version 5 once the gdb and lldb shipping with the latest debian
|
||||||
|
|
|
@ -320,8 +320,8 @@ fn codegen_global_asm(tcx: TyCtxt<'_>, cgu_name: &str, global_asm: &str) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg!(not(feature = "inline_asm"))
|
if cfg!(not(feature = "inline_asm"))
|
||||||
|| tcx.sess.target.options.is_like_osx
|
|| tcx.sess.target.is_like_osx
|
||||||
|| tcx.sess.target.options.is_like_windows
|
|| tcx.sess.target.is_like_windows
|
||||||
{
|
{
|
||||||
if global_asm.contains("__rust_probestack") {
|
if global_asm.contains("__rust_probestack") {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -101,7 +101,7 @@ pub(crate) fn write_metadata<P: WriteMetadata>(
|
||||||
product.add_rustc_section(
|
product.add_rustc_section(
|
||||||
rustc_middle::middle::exported_symbols::metadata_symbol_name(tcx),
|
rustc_middle::middle::exported_symbols::metadata_symbol_name(tcx),
|
||||||
compressed,
|
compressed,
|
||||||
tcx.sess.target.options.is_like_osx,
|
tcx.sess.target.is_like_osx,
|
||||||
);
|
);
|
||||||
|
|
||||||
metadata
|
metadata
|
||||||
|
|
|
@ -91,7 +91,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
|
||||||
} else if stem == "link" || stem == "lld-link" {
|
} else if stem == "link" || stem == "lld-link" {
|
||||||
LinkerFlavor::Msvc
|
LinkerFlavor::Msvc
|
||||||
} else if stem == "lld" || stem == "rust-lld" {
|
} else if stem == "lld" || stem == "rust-lld" {
|
||||||
LinkerFlavor::Lld(sess.target.options.lld_flavor)
|
LinkerFlavor::Lld(sess.target.lld_flavor)
|
||||||
} else {
|
} else {
|
||||||
// fall back to the value in the target spec
|
// fall back to the value in the target spec
|
||||||
sess.target.linker_flavor
|
sess.target.linker_flavor
|
||||||
|
@ -115,7 +115,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) {
|
||||||
|
|
||||||
if let Some(ret) = infer_from(
|
if let Some(ret) = infer_from(
|
||||||
sess,
|
sess,
|
||||||
sess.target.options.linker.clone().map(PathBuf::from),
|
sess.target.linker.clone().map(PathBuf::from),
|
||||||
Some(sess.target.linker_flavor),
|
Some(sess.target.linker_flavor),
|
||||||
) {
|
) {
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue