File tree Expand file tree Collapse file tree 2 files changed +8
-11
lines changed
Expand file tree Collapse file tree 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',
294294 dest = 'without_perfctr' ,
295295 help = 'build without performance counters' )
296296
297+ # Dummy option for backwards compatibility
297298parser .add_option ('--with-snapshot' ,
298299 action = 'store_true' ,
299- dest = 'with_snapshot ' ,
300+ dest = 'unused_with_snapshot ' ,
300301 help = optparse .SUPPRESS_HELP )
301302
302- # Dummy option for backwards compatibility.
303303parser .add_option ('--without-snapshot' ,
304- action = 'store_true' ,
305- dest = 'unused_without_snapshot' ,
304+ action = 'store_false' ,
305+ dest = 'with_snapshot' ,
306+ default = True ,
306307 help = optparse .SUPPRESS_HELP )
307308
308309parser .add_option ('--without-ssl' ,
@@ -579,10 +580,6 @@ def configure_arm(o):
579580 o ['variables' ]['arm_fpu' ] = 'vfpv3'
580581 o ['variables' ]['arm_version' ] = '7'
581582
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-
586583
587584def configure_mips (o ):
588585 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=
2121set noprojgen =
2222set nobuild =
2323set nosign =
24- set snapshot =
24+ set nosnapshot =
2525set test_args =
2626set msi =
2727set licensertf =
@@ -47,7 +47,7 @@ if /i "%1"=="x64" set target_arch=x64&goto arg-ok
4747if /i " %1 " == " noprojgen" set noprojgen = 1& goto arg-ok
4848if /i " %1 " == " nobuild" set nobuild = 1& goto arg-ok
4949if /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
5151if /i " %1 " == " noetw" set noetw = 1& goto arg-ok
5252if /i " %1 " == " noperfctr" set noperfctr = 1& goto arg-ok
5353if /i " %1 " == " licensertf" set licensertf = 1& goto arg-ok
@@ -76,7 +76,7 @@ goto next-arg
7676:args-done
7777if " %config% " == " Debug" set debug_arg = --debug
7878if " %target_arch% " == " x64" set msiplatform = x64
79- if defined snapshot set snapshot_arg = --with -snapshot
79+ if defined nosnapshot set snapshot_arg = --without -snapshot
8080if defined noetw set noetw_arg = --without-etw& set noetw_msi_arg = /p:NoETW=1
8181if defined noperfctr set noperfctr_arg = --without-perfctr& set noperfctr_msi_arg = /p:NoPerfCtr=1
8282
You can’t perform that action at this time.
0 commit comments