@@ -192,13 +192,15 @@ valopt_core() {
192
192
then
193
193
local UOP=$( echo $OP | tr ' [:lower:]' ' [:upper:]' | tr ' \-' ' \_' )
194
194
local V=" CFG_${UOP} "
195
+ local V_PROVIDED=" ${V} _PROVIDED"
195
196
eval $V =" $DEFAULT "
196
197
for arg in $CFG_CONFIGURE_ARGS
197
198
do
198
199
if echo " $arg " | grep -q -- " --$OP ="
199
200
then
200
201
val=$( echo " $arg " | cut -f2 -d=)
201
202
eval $V =$val
203
+ eval $V_PROVIDED =1
202
204
fi
203
205
done
204
206
if [ " $SAVE " = " save" ]
@@ -247,8 +249,10 @@ opt_core() {
247
249
if [ $DEFAULT -eq 0 ]
248
250
then
249
251
FLAG=" enable"
252
+ DEFAULT_FLAG=" disable"
250
253
else
251
254
FLAG=" disable"
255
+ DEFAULT_FLAG=" enable"
252
256
DOC=" don't $DOC "
253
257
fi
254
258
@@ -261,11 +265,19 @@ opt_core() {
261
265
OP=$( echo $OP | tr ' a-z-' ' A-Z_' )
262
266
FLAG=$( echo $FLAG | tr ' a-z' ' A-Z' )
263
267
local V=" CFG_${FLAG} _${OP} "
268
+ local V_PROVIDED=" CFG_${FLAG} _${OP} _PROVIDED"
264
269
eval $V =1
270
+ eval $V_PROVIDED =1
265
271
if [ " $SAVE " = " save" ]
266
272
then
267
273
putvar $V
268
274
fi
275
+ elif [ " $arg " = " --${DEFAULT_FLAG} -${OP} " ]
276
+ then
277
+ OP=$( echo $OP | tr ' a-z-' ' A-Z_' )
278
+ DEFAULT_FLAG=$( echo $DEFAULT_FLAG | tr ' a-z' ' A-Z' )
279
+ local V_PROVIDED=" CFG_${DEFAULT_FLAG} _${OP} _PROVIDED"
280
+ eval $V_PROVIDED =1
269
281
fi
270
282
done
271
283
else
@@ -633,8 +645,11 @@ esac
633
645
# Adjust perf and debug options for debug mode
634
646
if [ -n " $CFG_ENABLE_DEBUG " ]; then
635
647
msg " debug mode enabled, setting performance options"
636
- CFG_DISABLE_OPTIMIZE=1
637
- CFG_DISABLE_OPTIMIZE_CXX=1
648
+ if [ -z " $CFG_ENABLE_OPTIMIZE_PROVIDED " ]; then
649
+ msg " optimization not explicitly enabled, disabling optimization"
650
+ CFG_DISABLE_OPTIMIZE=1
651
+ CFG_DISABLE_OPTIMIZE_CXX=1
652
+ fi
638
653
CFG_ENABLE_LLVM_ASSERTIONS=1
639
654
CFG_ENABLE_DEBUG_ASSERTIONS=1
640
655
CFG_ENABLE_DEBUG_JEMALLOC=1
0 commit comments