Commit 79d77bcd authored by Peter Maydell's avatar Peter Maydell
Browse files

configure: Remove --source-path option 



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 92712822 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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Message-id: 20190318134019.23729-1-peter.maydell@linaro.org
parent aa64cfae

configure

+2 −8
Original line number Diff line number Diff line
@@ -278,6 +278,8 @@ ld_has() { 


# default parameters

source_path=$(dirname "$0")

# make source path absolute

source_path=$(cd "$source_path"; pwd)

cpu=""

iasl="iasl"

interp_prefix="/usr/gnemul/qemu-%M"
@@ -520,8 +522,6 @@ for opt do 
  ;;

  --cxx=*) CXX="$optarg"

  ;;

  --source-path=*) source_path="$optarg"

  ;;

  --cpu=*) cpu="$optarg"

  ;;

  --extra-cflags=*) QEMU_CFLAGS="$QEMU_CFLAGS $optarg"
@@ -600,9 +600,6 @@ if test "$debug_info" = "yes"; then 
    LDFLAGS="-g $LDFLAGS"

fi



# make source path absolute

source_path=$(cd "$source_path"; pwd)



# running configure in the source tree?

# we know that's the case if configure is there.

if test -f "./configure"; then
@@ -946,8 +943,6 @@ for opt do 
  ;;

  --interp-prefix=*) interp_prefix="$optarg"

  ;;

  --source-path=*)

  ;;

  --cross-prefix=*)

  ;;

  --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



Advanced options (experts only):

  --source-path=PATH       path of source code [$source_path]

  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]

  --cc=CC                  use C compiler CC [$cc]

  --iasl=IASL              use ACPI compiler IASL [$iasl]