diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-03 06:04:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 06:04:20 +0200 |
| commit | 30efce95cba5acf3488857244136fc4f19b2ce2d (patch) | |
| tree | 6f430ea552220e184c4570c0ce3c38d20edf2969 /compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp | |
| parent | d7a8936b78b9073842e46098df1cb73344598389 (diff) | |
| parent | 42ecde4e5f1b9067939663a77acf85fcc36199d1 (diff) | |
| download | rust-30efce95cba5acf3488857244136fc4f19b2ce2d.tar.gz rust-30efce95cba5acf3488857244136fc4f19b2ce2d.zip | |
Rollup merge of #124594 - jieyouxu:rmake-cc, r=fmease
run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS
In #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)
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp')
0 files changed, 0 insertions, 0 deletions
