Skip to content

Commit 9f82026

Browse files
committed
Fix --disable/enable-xxx actually enable/disable xxx feature
For example, --disable-debug-info enables debug-info, this results in confusion. In AC_ARG_ENABLE, the last two parts are action-if-present and action-if-not-present, but not are action-if-enabled and action-if-disable. We can utilize autoconf's default and simplify configure.ac. Signed-off-by: demin.han <[email protected]>
1 parent 235c8cd commit 9f82026

File tree

2 files changed

+67
-118
lines changed

2 files changed

+67
-118
lines changed

configure

Lines changed: 30 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3929,13 +3929,10 @@ fi
39293929
if test ${enable_linux+y}
39303930
then :
39313931
enableval=$enable_linux;
3932-
else $as_nop
3933-
enable_linux=no
3934-
39353932
fi
39363933
39373934
3938-
if test "x$enable_linux" != xno
3935+
if test "x$enable_linux" = xyes
39393936
then :
39403937
default_target=linux
39413938
@@ -3947,43 +3944,36 @@ fi
39473944
# Check whether --enable-debug_info was given.
39483945
if test ${enable_debug_info+y}
39493946
then :
3950-
enableval=$enable_debug_info; enable_debug_info=yes
3951-
else $as_nop
3952-
enable_debug_info=no
3953-
3947+
enableval=$enable_debug_info;
39543948
fi
39553949
39563950
3957-
if test "x$enable_debug_info" != xyes
3951+
if test "x$enable_debug_info" = xyes
39583952
then :
3959-
debug_info=""
3953+
debug_info="-g"
39603954
39613955
else $as_nop
3962-
debug_info="-g"
3956+
debug_info=""
39633957
39643958
fi
39653959
39663960
# Check whether --enable-default-pie was given.
39673961
if test ${enable_default_pie+y}
39683962
then :
39693963
enableval=$enable_default_pie;
3970-
else $as_nop
3971-
enable_default_pie=no
3972-
39733964
fi
39743965
39753966
3976-
if test "x$enable_default_pie" != xyes
3967+
if test "x$enable_default_pie" = xyes
39773968
then :
3978-
enable_default_pie="--disable-default-pie"
3969+
enable_default_pie="--enable-default-pie"
39793970
39803971
else $as_nop
3981-
enable_default_pie="--enable-default-pie"
3972+
enable_default_pie="--disable-default-pie"
39823973
39833974
fi
39843975
39853976
3986-
39873977
# Check whether --with-arch was given.
39883978
if test ${with_arch+y}
39893979
then :
@@ -4091,9 +4081,6 @@ WITH_LANGUAGES=$with_languages
40914081
if test ${enable_multilib+y}
40924082
then :
40934083
enableval=$enable_multilib;
4094-
else $as_nop
4095-
enable_multilib=no
4096-
40974084
fi
40984085
40994086
@@ -4137,7 +4124,7 @@ else $as_nop
41374124
41384125
fi
41394126
4140-
if test "x$enable_multilib" != xno || test "x$with_multilib_generator" != xno
4127+
if test "x$enable_multilib" = xyes || test "x$with_multilib_generator" != xno
41414128
then :
41424129
multilib_flags=--enable-multilib
41434130
@@ -4146,7 +4133,7 @@ else $as_nop
41464133
41474134
fi
41484135
4149-
if test "x$enable_multilib" != xno
4136+
if test "x$enable_multilib" = xyes
41504137
then :
41514138
glibc_multilib_names="rv32imac-ilp32 rv32gc-ilp32d rv64imac-lp64 rv64gc-lp64d rv64gcv-lp64d"
41524139
@@ -4155,7 +4142,7 @@ else $as_nop
41554142
41564143
fi
41574144
4158-
if test "x$enable_multilib" != xno
4145+
if test "x$enable_multilib" = xyes
41594146
then :
41604147
newlib_multilib_names="rv32i-ilp32 rv32iac-ilp32 rv32im-ilp32 rv32imac-ilp32 rv32imafc-ilp32f rv64imac-lp64 rv64gc-lp64d"
41614148
@@ -4164,7 +4151,7 @@ else $as_nop
41644151
41654152
fi
41664153
4167-
if test "x$enable_multilib" != xno
4154+
if test "x$enable_multilib" = xyes
41684155
then :
41694156
musl_multilib_names="rv32imac-ilp32 rv32gc-ilp32d rv64imac-lp64 rv64gc-lp64d"
41704157
@@ -4179,9 +4166,10 @@ then :
41794166
enableval=$enable_gcc_checking;
41804167
fi
41814168
4182-
if test "x$enable_gcc_checking" != x
4169+
4170+
if test "x$enable_gcc_checking" = xyes
41834171
then :
4184-
gcc_checking=--enable-checking=$enable_gcc_checking
4172+
gcc_checking=--enable-checking
41854173
41864174
else $as_nop
41874175
gcc_checking=""
@@ -4195,6 +4183,7 @@ then :
41954183
withval=$with_cmodel;
41964184
fi
41974185
4186+
41984187
if test "x$with_cmodel" != x
41994188
then :
42004189
cmodel=-mcmodel=$with_cmodel
@@ -4294,9 +4283,6 @@ fi
42944283
if test ${enable_gdb+y}
42954284
then :
42964285
enableval=$enable_gdb;
4297-
else $as_nop
4298-
enable_gdb=yes
4299-
43004286
fi
43014287
43024288
@@ -4312,48 +4298,48 @@ fi
43124298
# Check whether --enable-llvm was given.
43134299
if test ${enable_llvm+y}
43144300
then :
4315-
enableval=$enable_llvm; enable_llvm=yes
4301+
enableval=$enable_llvm;
43164302
fi
43174303
43184304
4319-
if test "x$enable_llvm" != xyes
4305+
if test "x$enable_llvm" = xyes
43204306
then :
4321-
enable_llvm=--disable-llvm
4307+
enable_llvm=--enable-llvm
43224308
43234309
else $as_nop
4324-
enable_llvm=--enable-llvm
4310+
enable_llvm=--disable-llvm
43254311
43264312
fi
43274313
43284314
# Check whether --enable-host-gcc was given.
43294315
if test ${enable_host_gcc+y}
43304316
then :
4331-
enableval=$enable_host_gcc; enable_host_gcc=yes
4317+
enableval=$enable_host_gcc;
43324318
fi
43334319
43344320
4335-
if test "x$enable_host_gcc" != xyes
4321+
if test "x$enable_host_gcc" = xyes
43364322
then :
4337-
enable_host_gcc=--disable-host-gcc
4323+
enable_host_gcc=--enable-host-gcc
43384324
43394325
else $as_nop
4340-
enable_host_gcc=--enable-host-gcc
4326+
enable_host_gcc=--disable-host-gcc
43414327
43424328
fi
43434329
43444330
# Check whether --enable-strip was given.
43454331
if test ${enable_strip+y}
43464332
then :
4347-
enableval=$enable_strip; enable_strip=yes
4333+
enableval=$enable_strip;
43484334
fi
43494335
43504336
4351-
if test "x$enable_strip" != xyes
4337+
if test "x$enable_strip" = xyes
43524338
then :
4353-
install_target=install
4339+
install_target=install-strip
43544340
43554341
else $as_nop
4356-
install_target=install-strip
4342+
install_target=install
43574343
43584344
fi
43594345
@@ -4642,13 +4628,10 @@ fi
46424628
if test ${enable_libsanitizer+y}
46434629
then :
46444630
enableval=$enable_libsanitizer;
4645-
else $as_nop
4646-
enable_libsanitizer=no
4647-
46484631
fi
46494632
46504633
4651-
if test "x$enable_libsanitizer" != xno
4634+
if test "x$enable_libsanitizer" = xyes
46524635
then :
46534636
enable_libsanitizer=--enable-libsanitizer
46544637
@@ -4661,13 +4644,10 @@ fi
46614644
if test ${enable_qemu_system+y}
46624645
then :
46634646
enableval=$enable_qemu_system;
4664-
else $as_nop
4665-
enable_qemu_system=no
4666-
46674647
fi
46684648
46694649
4670-
if test "x$enable_qemu_system" != xno
4650+
if test "x$enable_qemu_system" = xyes
46714651
then :
46724652
qemu_targets=riscv64-linux-user,riscv32-linux-user,riscv64-softmmu,riscv32-softmmu
46734653

0 commit comments

Comments
 (0)