Skip to content

Commit c6e16fa

Browse files
committed
[oss] Default flag(opt) to True
We want opt mode by default for Cabal builds, but assertions and debug symbols for dev builds by default.
1 parent bc8176a commit c6e16fa

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

cabal.project

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ package thrift-tests
4848
package thrift-http
4949
ghc-options: -Werror
5050

51+
-- Assertions and debug symbols on for dev builds
52+
package glean
53+
flags: -opt
54+
5155
package fb-util
5256
flags: +folly
5357

glean.cabal.in

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

5858
common fb-cpp
59-
cxx-options: -std=c++17 -Wno-nullability-completeness
59+
cxx-options: -std=c++17 -Wno-nullability-completeness -fno-omit-frame-pointer
6060
if !flag(clang)
6161
cxx-options: -fcoroutines
6262
if flag(asan)
6363
cxx-options: -fsanitize=address
6464
if arch(x86_64)
6565
cxx-options: -march=haswell
66-
if flag(opt)
66+
if flag(opt) && !flag(asan)
6767
cxx-options: -O3 -DNDEBUG
68+
else
69+
cc-options: -g
70+
cxx-options: -g
6871
CXX_EXTRA_LIB_DIRS
6972

7073
common exe
@@ -85,7 +88,7 @@ flag asan
8588
default: False
8689

8790
flag opt
88-
default: False
91+
default: True
8992

9093
flag benchmarks
9194
default: False

0 commit comments

Comments
 (0)