File tree 2 files changed +8
-11
lines changed 2 files changed +8
-11
lines changed Original file line number Diff line number Diff line change @@ -294,15 +294,16 @@ parser.add_option('--without-perfctr',
294
294
dest = 'without_perfctr' ,
295
295
help = 'build without performance counters' )
296
296
297
+ # Dummy option for backwards compatibility
297
298
parser .add_option ('--with-snapshot' ,
298
299
action = 'store_true' ,
299
- dest = 'with_snapshot ' ,
300
+ dest = 'unused_with_snapshot ' ,
300
301
help = optparse .SUPPRESS_HELP )
301
302
302
- # Dummy option for backwards compatibility.
303
303
parser .add_option ('--without-snapshot' ,
304
- action = 'store_true' ,
305
- dest = 'unused_without_snapshot' ,
304
+ action = 'store_false' ,
305
+ dest = 'with_snapshot' ,
306
+ default = True ,
306
307
help = optparse .SUPPRESS_HELP )
307
308
308
309
parser .add_option ('--without-ssl' ,
@@ -579,10 +580,6 @@ def configure_arm(o):
579
580
o ['variables' ]['arm_fpu' ] = 'vfpv3'
580
581
o ['variables' ]['arm_version' ] = '7'
581
582
582
- # Print warning when snapshot is enabled and building on armv6
583
- if is_arch_armv6 () and options .with_snapshot :
584
- warn ('when building on ARMv6, don\' t use --with-snapshot' )
585
-
586
583
587
584
def configure_mips (o ):
588
585
can_use_fpu_instructions = (options .mips_float_abi != 'soft' )
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ set snapshot_arg=
21
21
set noprojgen =
22
22
set nobuild =
23
23
set nosign =
24
- set snapshot =
24
+ set nosnapshot =
25
25
set test_args =
26
26
set msi =
27
27
set licensertf =
@@ -47,7 +47,7 @@ if /i "%1"=="x64" set target_arch=x64&goto arg-ok
47
47
if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
48
48
if /i " %1 " == " nobuild" set nobuild = 1& goto arg-ok
49
49
if /i " %1 " == " nosign" set nosign = 1& goto arg-ok
50
- if /i " %1 " == " snapshot " set snapshot = 1& goto arg-ok
50
+ if /i " %1 " == " nosnapshot " set nosnapshot = 1& goto arg-ok
51
51
if /i " %1 " == " noetw" set noetw = 1& goto arg-ok
52
52
if /i " %1 " == " noperfctr" set noperfctr = 1& goto arg-ok
53
53
if /i " %1 " == " licensertf" set licensertf = 1& goto arg-ok
@@ -76,7 +76,7 @@ goto next-arg
76
76
:args-done
77
77
if " %config% " == " Debug" set debug_arg = --debug
78
78
if " %target_arch% " == " x64" set msiplatform = x64
79
- if defined snapshot set snapshot_arg = --with -snapshot
79
+ if defined nosnapshot set snapshot_arg = --without -snapshot
80
80
if defined noetw set noetw_arg = --without-etw& set noetw_msi_arg = /p:NoETW=1
81
81
if defined noperfctr set noperfctr_arg = --without-perfctr& set noperfctr_msi_arg = /p:NoPerfCtr=1
82
82
You can’t perform that action at this time.
0 commit comments