-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #119018 - matthiaskrgr:rollup-inlg0yr, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #118644 (Add test for Apple's `-weak_framework` linker argument) - #118828 (Remove dead codes in rustc_codegen_gcc) - #119001 (rustdoc-search: remove parallel searchWords array) r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
16 changed files
with
131 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# only-macos | ||
# | ||
# Check that linking to a framework actually makes it to the linker. | ||
|
||
include ../tools.mk | ||
|
||
all: | ||
$(RUSTC) dep-link-framework.rs | ||
$(RUSTC) dep-link-weak-framework.rs | ||
|
||
$(RUSTC) empty.rs | ||
otool -L $(TMPDIR)/no-link | $(CGREP) -v CoreFoundation | ||
|
||
$(RUSTC) link-framework.rs | ||
otool -L $(TMPDIR)/link-framework | $(CGREP) CoreFoundation | $(CGREP) -v weak | ||
|
||
$(RUSTC) link-weak-framework.rs | ||
otool -L $(TMPDIR)/link-weak-framework | $(CGREP) CoreFoundation | $(CGREP) weak | ||
|
||
# When linking the framework both normally, and weakly, the weak linking takes preference | ||
|
||
$(RUSTC) link-both.rs | ||
otool -L $(TMPDIR)/link-both | $(CGREP) CoreFoundation | $(CGREP) weak |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
#![crate_type = "rlib"] | ||
|
||
#[link(name = "CoreFoundation", kind = "framework")] | ||
extern "C" {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#![crate_type = "rlib"] | ||
#![feature(link_arg_attribute)] | ||
|
||
#[link(name = "-weak_framework", kind = "link-arg", modifiers = "+verbatim")] | ||
#[link(name = "CoreFoundation", kind = "link-arg", modifiers = "+verbatim")] | ||
extern "C" {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
extern crate dep_link_framework; | ||
extern crate dep_link_weak_framework; | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
extern crate dep_link_framework; | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
extern crate dep_link_weak_framework; | ||
|
||
fn main() {} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.