mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Remove --source-path option

Browse Source 
Normally configure identifies the source path by looking
at the location where the configure script itself exists.
We also provide a --source-path option which lets the user
manually override this.

There isn't really an obvious use case for the --source-path
option, and in commit 927128222b0a91f56c13a in 2017 we
accidentally added some logic that looks at $source_path
before the command line option that overrides it has been
processed.

The fact that nobody complained suggests that there isn't
any use of this option and we aren't testing it either;
remove it. This allows us to move the "make $source_path
absolute" logic up so that there is no window in the script
where $source_path is set but not yet absolute.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190318134019.23729-1-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-04-29 17:35:57 +01:00
parent aa64cfaeb4
commit 79d77bcd36
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -278,6 +278,8 @@ ld_has() {
# default parameters # default parameters
source_path=$(dirname "$0") source_path=$(dirname "$0")
# make source path absolute
source_path=$(cd "$source_path"; pwd)
cpu="" cpu=""
iasl="iasl" iasl="iasl"
interp_prefix="/usr/gnemul/qemu-%M" interp_prefix="/usr/gnemul/qemu-%M"
@ -520,8 +522,6 @@ for opt do
;; ;;
--cxx=*) CXX="$optarg" --cxx=*) CXX="$optarg"
;; ;;
--source-path=*) source_path="$optarg"
;;
--cpu=*) cpu="$optarg" --cpu=*) cpu="$optarg"
;; ;;
--extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg" --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg"
@ -600,9 +600,6 @@ if test "$debug_info" = "yes"; then
LDFLAGS="-g $LDFLAGS" LDFLAGS="-g $LDFLAGS"
fi fi
# make source path absolute
source_path=$(cd "$source_path"; pwd)
# running configure in the source tree? # running configure in the source tree?
# we know that's the case if configure is there. # we know that's the case if configure is there.
if test -f "./configure"; then if test -f "./configure"; then
@ -946,8 +943,6 @@ for opt do
;; ;;
--interp-prefix=*) interp_prefix="$optarg" --interp-prefix=*) interp_prefix="$optarg"
;; ;;
--source-path=*)
;;
--cross-prefix=*) --cross-prefix=*)
;; ;;
--cc=*) --cc=*)
@ -1651,7 +1646,6 @@ $(echo Available targets: $default_target_list | \
--target-list-exclude=LIST exclude a set of targets from the default target-list --target-list-exclude=LIST exclude a set of targets from the default target-list
Advanced options (experts only): Advanced options (experts only):
--source-path=PATH path of source code [$source_path]
--cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix] --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]
--cc=CC use C compiler CC [$cc] --cc=CC use C compiler CC [$cc]
--iasl=IASL use ACPI compiler IASL [$iasl] --iasl=IASL use ACPI compiler IASL [$iasl]