run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS #124594
Conversation
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
rustbot
added
S-waiting-on-review
rust-cloud-vms
bot
force-pushed
the
rmake-cc
branch
3 times, most recently
from
357d412
to
c002eff
Compare
This comment has been minimized.
This comment has been minimized.
rust-cloud-vms
bot
force-pushed
the
rmake-cc
branch
2 times, most recently
from
da9f1dd
to
6834063
Compare
jieyouxu
added
T-compiler
|
r? compiler |
This comment has been minimized.
This comment has been minimized.
|
@rustbot author |
rustbot
added
S-waiting-on-author
rust-cloud-vms
bot
force-pushed
the
rmake-cc
branch
from
6834063
to
42ecde4
Compare
|
@rustbot ready |
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
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)
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
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)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Rollup of 8 pull requests Successful merges: - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124612 (Add support for inputing via stdin with run-make-support) r? `@ghost` `@rustbot` modify labels: rollup
fmease
added a commit
to fmease/rust
that referenced
this pull request
May 3, 2024
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)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
Rollup of 7 pull requests Successful merges: - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124637 (AST pretty: Use `builtin_syntax` for type ascription) Failed merges: - rust-lang#124638 (Move some tests from `rustc_expand` to `rustc_parse`.) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#123480 (deref patterns: impl `DerefPure` for more std types) - rust-lang#124412 (io safety: update Unix explanation to use `Arc`) - rust-lang#124441 (String.truncate comment microfix (greater or equal)) - rust-lang#124594 (run-make-support: preserve tooks.mk behavior for EXTRACXXFLAGS) - rust-lang#124604 (library/std: Remove unused `gimli-symbolize` feature) - rust-lang#124607 (`rustc_expand` cleanups) - rust-lang#124609 (variable-precision float operations can differ depending on optimization levels) - rust-lang#124610 (Tweak `consts_may_unify`) - rust-lang#124626 (const_eval_select: add tracking issue) - rust-lang#124637 (AST pretty: Use `builtin_syntax` for type ascription) Failed merges: - rust-lang#124638 (Move some tests from `rustc_expand` to `rustc_parse`.) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2024
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)
|
@bors r- |
bors
added
S-waiting-on-author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #123149 when trying to add a command wrapper for
cc, I didn't preserve the behavior of tools.mk completely: tools.mk hadNote that for {
FreeBSD,SunOs,OpenBSD} the-lstdc++flag is not passed, soEXTRACXXFLAGSfor those platforms should be an emptyvec![].r? ghost (testing this with PR CI)