Skip to content

Commit a4d5328

Browse files
committed
Fix CI: switch to --std=c++20
1 parent 49c3a3c commit a4d5328

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

glean.cabal.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ common fb-haskell
5656
ghc-options: -O2
5757

5858
common fb-cpp
59-
cxx-options: -std=c++17 -Wno-nullability-completeness -fno-omit-frame-pointer
59+
cxx-options: -std=c++20 -Wno-nullability-completeness -fno-omit-frame-pointer
6060
if !flag(clang)
6161
cxx-options: -fcoroutines
6262
if flag(asan)
@@ -202,7 +202,7 @@ common deps
202202
hinotify ^>= 0.4.1
203203

204204
common hsc2hs-cpp
205-
hsc2hs-options: --cc=g++ --lflag=-lstdc++ --cflag=-D__HSC2HS__=1 --cflag=-std=c++17
205+
hsc2hs-options: --cc=g++ --lflag=-lstdc++ --cflag=-D__HSC2HS__=1 --cflag=-std=c++20
206206

207207
common thrift-server
208208
if flag(fbthrift)

glean/lang/clang/glean-clang.cabal

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ common fb-haskell
103103
ghc-options: -O2
104104

105105
common fb-cpp
106-
cxx-options: -DOSS=1 -std=c++17 -Wno-nullability-completeness
106+
cxx-options: -DOSS=1 -std=c++20 -Wno-nullability-completeness
107107
if arch(x86_64)
108108
cxx-options: -DGLEAN_X86_64 -march=haswell
109109
if flag(opt)
@@ -142,11 +142,7 @@ executable clang-index
142142
gflags,
143143
atomic,
144144
re2
145-
cxx-options: -fexceptions -DOSS=1 -std=c++17
146-
if arch(x86_64)
147-
cxx-options: -DGLEAN_X86_64 -march=haswell
148-
if flag(opt)
149-
cxx-options: -O3
145+
cxx-options: -fexceptions
150146

151147
executable clang-derive
152148
import: fb-haskell, fb-cpp, deps, exe

0 commit comments

Comments
 (0)