Skip to content

Commit ed168e7

Browse files
committed
run-make-support: remove outdated comments
1 parent 9b17c98 commit ed168e7

File tree

4 files changed

+0
-108
lines changed

4 files changed

+0
-108
lines changed

src/tools/run-make-support/src/artifact_names.rs

-17
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,6 @@ use crate::targets::is_msvc;
88
/// Construct the static library name based on the target.
99
#[must_use]
1010
pub fn static_lib_name(name: &str) -> String {
11-
// See tools.mk (irrelevant lines omitted):
12-
//
13-
// ```makefile
14-
// ifeq ($(UNAME),Darwin)
15-
// STATICLIB = $(TMPDIR)/lib$(1).a
16-
// else
17-
// ifdef IS_WINDOWS
18-
// ifdef IS_MSVC
19-
// STATICLIB = $(TMPDIR)/$(1).lib
20-
// else
21-
// STATICLIB = $(TMPDIR)/lib$(1).a
22-
// endif
23-
// else
24-
// STATICLIB = $(TMPDIR)/lib$(1).a
25-
// endif
26-
// endif
27-
// ```
2811
assert!(!name.contains(char::is_whitespace), "static library name cannot contain whitespace");
2912

3013
if is_msvc() { format!("{name}.lib") } else { format!("lib{name}.a") }

src/tools/run-make-support/src/external_deps/c_cxx_compiler/cc.rs

-11
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,6 @@ impl Cc {
8080

8181
/// Specify `-o` or `-Fe`/`-Fo` depending on platform/compiler.
8282
pub fn out_exe(&mut self, name: &str) -> &mut Self {
83-
// Ref: tools.mk (irrelevant lines omitted):
84-
//
85-
// ```makefile
86-
// ifdef IS_MSVC
87-
// OUT_EXE=-Fe:`cygpath -w $(TMPDIR)/$(call BIN,$(1))` \
88-
// -Fo:`cygpath -w $(TMPDIR)/$(1).obj`
89-
// else
90-
// OUT_EXE=-o $(TMPDIR)/$(1)
91-
// endif
92-
// ```
93-
9483
let mut path = std::path::PathBuf::from(name);
9584

9685
if is_msvc() {

src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs

-55
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,6 @@ use crate::{is_msvc, is_windows, uname};
22

33
/// `EXTRACFLAGS`
44
pub fn extra_c_flags() -> Vec<&'static str> {
5-
// Adapted from tools.mk (trimmed):
6-
//
7-
// ```makefile
8-
// ifdef IS_WINDOWS
9-
// ifdef IS_MSVC
10-
// EXTRACFLAGS := ws2_32.lib userenv.lib advapi32.lib bcrypt.lib ntdll.lib synchronization.lib
11-
// else
12-
// EXTRACFLAGS := -lws2_32 -luserenv -lbcrypt -lntdll -lsynchronization
13-
// endif
14-
// else
15-
// ifeq ($(UNAME),Darwin)
16-
// EXTRACFLAGS := -lresolv
17-
// else
18-
// ifeq ($(UNAME),FreeBSD)
19-
// EXTRACFLAGS := -lm -lpthread -lgcc_s
20-
// else
21-
// ifeq ($(UNAME),SunOS)
22-
// EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket -lresolv
23-
// else
24-
// ifeq ($(UNAME),OpenBSD)
25-
// EXTRACFLAGS := -lm -lpthread -lc++abi
26-
// else
27-
// EXTRACFLAGS := -lm -lrt -ldl -lpthread
28-
// endif
29-
// endif
30-
// endif
31-
// endif
32-
// endif
33-
// ```
34-
355
if is_windows() {
366
if is_msvc() {
377
vec![
@@ -60,31 +30,6 @@ pub fn extra_c_flags() -> Vec<&'static str> {
6030

6131
/// `EXTRACXXFLAGS`
6232
pub fn extra_cxx_flags() -> Vec<&'static str> {
63-
// Adapted from tools.mk (trimmed):
64-
//
65-
// ```makefile
66-
// ifdef IS_WINDOWS
67-
// ifdef IS_MSVC
68-
// else
69-
// EXTRACXXFLAGS := -lstdc++
70-
// endif
71-
// else
72-
// ifeq ($(UNAME),Darwin)
73-
// EXTRACXXFLAGS := -lc++
74-
// else
75-
// ifeq ($(UNAME),FreeBSD)
76-
// else
77-
// ifeq ($(UNAME),SunOS)
78-
// else
79-
// ifeq ($(UNAME),OpenBSD)
80-
// else
81-
// EXTRACXXFLAGS := -lstdc++
82-
// endif
83-
// endif
84-
// endif
85-
// endif
86-
// endif
87-
// ```
8833
if is_windows() {
8934
if is_msvc() { vec![] } else { vec!["-lstdc++"] }
9035
} else {

src/tools/run-make-support/src/external_deps/rustc.rs

-25
Original file line numberDiff line numberDiff line change
@@ -365,31 +365,6 @@ impl Rustc {
365365

366366
/// `EXTRARSCXXFLAGS`
367367
pub fn extra_rs_cxx_flags(&mut self) -> &mut Self {
368-
// Adapted from tools.mk (trimmed):
369-
//
370-
// ```makefile
371-
// ifdef IS_WINDOWS
372-
// ifdef IS_MSVC
373-
// else
374-
// EXTRARSCXXFLAGS := -lstatic:-bundle=stdc++
375-
// endif
376-
// else
377-
// ifeq ($(UNAME),Darwin)
378-
// EXTRARSCXXFLAGS := -lc++
379-
// else
380-
// ifeq ($(UNAME),FreeBSD)
381-
// else
382-
// ifeq ($(UNAME),SunOS)
383-
// else
384-
// ifeq ($(UNAME),OpenBSD)
385-
// else
386-
// EXTRARSCXXFLAGS := -lstdc++
387-
// endif
388-
// endif
389-
// endif
390-
// endif
391-
// endif
392-
// ```
393368
if is_windows() {
394369
// So this is a bit hacky: we can't use the DLL version of libstdc++ because
395370
// it pulls in the DLL version of libgcc, which means that we end up with 2

0 commit comments

Comments
 (0)