Skip to content

Commit 05da05d

Browse files
Victor Hugo Vianna Silvacopybara-github
authored andcommitted
[build] Remove use_cxx17 support
The last usage of this variable was removed in https://crrev.com/c/7124403. Bug: 330910097 Change-Id: I5ee1e4ce8a17085ad7ffdd4fdbebfb74060fc318 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7180481 Commit-Queue: Nico Weber <[email protected]> Reviewed-by: Nico Weber <[email protected]> Reviewed-by: Yuly Novikov <[email protected]> Cr-Commit-Position: refs/heads/main@{#1548496} NOKEYCHECK=True GitOrigin-RevId: e67ce2fa4a73a636db28dd24ac60c09eea9a9787
1 parent dbddf28 commit 05da05d

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

config/compiler/BUILD.gn

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -746,10 +746,7 @@ config("compiler") {
746746

747747
cflags_c += [ "-std=${standard_prefix}11" ]
748748
if (is_clang) {
749-
if (defined(use_cxx17) && use_cxx17) {
750-
assert(!use_cxx23)
751-
cflags_cc += [ "-std=${standard_prefix}++17" ]
752-
} else if (use_cxx23) {
749+
if (use_cxx23) {
753750
cflags_cc += [ "-std=${standard_prefix}++23" ]
754751
} else {
755752
cflags_cc += [ "-std=${standard_prefix}++20" ]
@@ -761,10 +758,7 @@ config("compiler") {
761758
}
762759
} else if (is_win) {
763760
cflags_c += [ "/std:c11" ]
764-
if (defined(use_cxx17) && use_cxx17) {
765-
assert(!use_cxx23)
766-
cflags_cc += [ "/std:c++17" ]
767-
} else if (use_cxx23) {
761+
if (use_cxx23) {
768762
cflags_cc += [ "/std:c++23preview" ]
769763
} else {
770764
cflags_cc += [ "/std:c++20" ]
@@ -778,10 +772,7 @@ config("compiler") {
778772
} else {
779773
cflags_c += [ "-std=c11" ]
780774

781-
if (defined(use_cxx17) && use_cxx17) {
782-
assert(!use_cxx23)
783-
cflags_cc += [ "-std=c++17" ]
784-
} else if (use_cxx23) {
775+
if (use_cxx23) {
785776
cflags_cc += [ "-std=c++23" ]
786777
} else {
787778
cflags_cc += [ "-std=c++20" ]

0 commit comments

Comments
 (0)