Commit ff67a7b
authored
Rollup merge of rust-lang#124594 - jieyouxu:rmake-cc, r=fmease
run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS
In rust-lang#123149 when trying to add a command wrapper for `cc`, I didn't preserve the behavior of tools.mk completely: tools.mk had
```makefile
# Extra flags needed to compile a working executable with the standard library
ifdef IS_WINDOWS
ifdef IS_MSVC
#EXTRACFLAGS := ws2_32.lib userenv.lib advapi32.lib bcrypt.lib ntdll.lib synchronization.lib
else
#EXTRACFLAGS := -lws2_32 -luserenv -lbcrypt -lntdll -lsynchronization
EXTRACXXFLAGS := -lstdc++
#EXTRARSCXXFLAGS := -l static:-bundle=stdc++
endif
else
ifeq ($(UNAME),Darwin)
#EXTRACFLAGS := -lresolv
EXTRACXXFLAGS := -lc++
#EXTRARSCXXFLAGS := -lc++
else
ifeq ($(UNAME),FreeBSD)
#EXTRACFLAGS := -lm -lpthread -lgcc_s
else
ifeq ($(UNAME),SunOS)
#EXTRACFLAGS := -lm -lpthread -lposix4 -lsocket -lresolv
else
ifeq ($(UNAME),OpenBSD)
#EXTRACFLAGS := -lm -lpthread -lc++abi
#RUSTC := $(RUSTC) -C linker="$(word 1,$(CC:ccache=))"
else
#EXTRACFLAGS := -lm -lrt -ldl -lpthread
EXTRACXXFLAGS := -lstdc++
#EXTRARSCXXFLAGS := -lstdc++
endif
endif
endif
endif
endif
```
Note that for {`FreeBSD`, `SunOs`, `OpenBSD`} the `-lstdc++` flag is *not* passed, so `EXTRACXXFLAGS` for those platforms should be an empty `vec![]`.
r? ghost (testing this with PR CI)1 file changed
+3
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
164 | | - | |
165 | | - | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
166 | 167 | | |
167 | 168 | | |
168 | 169 | | |
| |||
0 commit comments