@@ -85,38 +85,26 @@ def _patch_build_mode_flags(kwargs):
85
85
Returns:
86
86
The possibly-modified `kwargs` parameter for chaining.
87
87
"""
88
- build_mode = native .read_config ("fbcode" , "build_mode_test_label" , "" )
89
- flags = []
90
-
91
- # Base build modes.
92
- if build_mode .startswith ("dev" ):
93
- flags .append ("-D__ET_BUILD_MODE_DEV=1" )
94
- elif build_mode .startswith ("opt" ):
95
- flags .append ("-D__ET_BUILD_MODE_OPT=1" )
96
- elif build_mode .startswith ("dbgo" ):
97
- flags .append ("-D__ET_BUILD_MODE_DBGO=1" )
98
- elif build_mode .startswith ("dbg" ):
99
- flags .append ("-D__ET_BUILD_MODE_DBG=1" )
100
-
101
- # Build mode extensions.
102
- if "-cov" in build_mode :
103
- flags .append ("-D__ET_BUILD_MODE_COV=1" )
104
- elif "-asan" in build_mode :
105
- flags .append ("-D__ET_BUILD_MODE_ASAN=1" )
106
- elif "-tsan" in build_mode :
107
- flags .append ("-D__ET_BUILD_MODE_TSAN=1" )
108
- elif "-ubsan" in build_mode :
109
- flags .append ("-D__ET_BUILD_MODE_UBSAN=1" )
110
- elif "-lto" in build_mode :
111
- flags .append ("-D__ET_BUILD_MODE_LTO=1" )
112
-
113
88
if "compiler_flags" not in kwargs :
114
89
kwargs ["compiler_flags" ] = []
115
90
116
91
# kwargs["compiler_flags"].extend(flags) or kwargs["compiler_flags"] += would
117
92
# fail if kwargs["compiler_flags"] is Immutable (ex: the default argument of
118
93
# a Buck macro)
119
- kwargs ["compiler_flags" ] = kwargs ["compiler_flags" ] + flags
94
+ kwargs ["compiler_flags" ] = kwargs ["compiler_flags" ] + select ({
95
+ "DEFAULT" : [],
96
+ "ovr_config//build_mode/constraints:dbg" : ["-D__ET_BUILD_MODE_DBG=1" ],
97
+ "ovr_config//build_mode/constraints:dbgo" : ["-D__ET_BUILD_MODE_DBGO=1" ],
98
+ "ovr_config//build_mode/constraints:dev" : ["-D__ET_BUILD_MODE_DEV=1" ],
99
+ "ovr_config//build_mode/constraints:opt" : ["-D__ET_BUILD_MODE_OPT=1" ],
100
+ }) + select ({
101
+ "DEFAULT" : [],
102
+ "ovr_config//build_mode/constraints:asan" : ["-D__ET_BUILD_MODE_ASAN=1" ],
103
+ "ovr_config//build_mode/constraints:tsan" : ["-D__ET_BUILD_MODE_TSAN=1" ],
104
+ "ovr_config//build_mode/constraints:ubsan" : ["-D__ET_BUILD_MODE_UBSAN=1" ],
105
+ "ovr_config//build_mode/constraints:lto-fat" : ["-D__ET_BUILD_MODE_LTO=1" ],
106
+ "ovr_config//build_mode/constraints:code-coverage" : ["-D__ET_BUILD_MODE_COV=1" ],
107
+ })
120
108
121
109
return kwargs
122
110
@@ -125,16 +113,16 @@ def _patch_test_compiler_flags(kwargs):
125
113
kwargs ["compiler_flags" ] = []
126
114
127
115
# Required globally by all c++ tests.
128
- kwargs ["compiler_flags" ]. extend ( [
116
+ kwargs ["compiler_flags" ] += [
129
117
"-std=c++17" ,
130
- ])
118
+ ]
131
119
132
120
# Relaxing some constraints for tests
133
- kwargs ["compiler_flags" ]. extend ( [
121
+ kwargs ["compiler_flags" ] += [
134
122
"-Wno-missing-prototypes" ,
135
123
"-Wno-unused-variable" ,
136
124
"-Wno-error" ,
137
- ])
125
+ ]
138
126
return kwargs
139
127
140
128
def _external_dep_location (name ):
0 commit comments