OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: ignore --make

Browse Source 
Setting the MAKE variable to a GNU Make executable does not really have
any effect: if a non-GNU Make is used, the QEMU Makefile will fail to
parse.  Just remove everything related to --make and $make as dead code.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-06-07 12:48:49 +02:00
parent c53648abba
commit b17bbf835c
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -400,20 +400,16 @@ gnu/kfreebsd)
;; ;;
freebsd) freebsd)
bsd="yes" bsd="yes"
make="${MAKE-gmake}"
# needed for kinfo_getvmmap(3) in libutil.h # needed for kinfo_getvmmap(3) in libutil.h
;; ;;
dragonfly) dragonfly)
bsd="yes" bsd="yes"
make="${MAKE-gmake}"
;; ;;
netbsd) netbsd)
bsd="yes" bsd="yes"
make="${MAKE-gmake}"
;; ;;
openbsd) openbsd)
bsd="yes" bsd="yes"
make="${MAKE-gmake}"
;; ;;
darwin) darwin)
bsd="yes" bsd="yes"
@ -421,7 +417,6 @@ darwin)
;; ;;
sunos) sunos)
solaris="yes" solaris="yes"
make="${MAKE-gmake}"
;; ;;
haiku) haiku)
pie="no" pie="no"
@ -525,9 +520,6 @@ case "$cpu" in
CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;; CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;;
esac esac
: ${make=${MAKE-make}}
check_py_version() { check_py_version() {
# We require python >= 3.7. # We require python >= 3.7.
# NB: a True python conditional creates a non-zero return code (Failure) # NB: a True python conditional creates a non-zero return code (Failure)
@ -630,7 +622,7 @@ for opt do
;; ;;
--objcc=*) --objcc=*)
;; ;;
--make=*) make="$optarg" --make=*)
;; ;;
--install=*) --install=*)
;; ;;
@ -897,7 +889,6 @@ Advanced options (experts only):
--cross-cc-ARCH=CC use compiler when building ARCH guest test cases --cross-cc-ARCH=CC use compiler when building ARCH guest test cases
--cross-cc-cflags-ARCH= use compiler flags when building ARCH guest tests --cross-cc-cflags-ARCH= use compiler flags when building ARCH guest tests
--cross-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases --cross-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases
--make=MAKE use specified make [$make]
--python=PYTHON use specified python [$python] --python=PYTHON use specified python [$python]
--ninja=NINJA use specified ninja [$ninja] --ninja=NINJA use specified ninja [$ninja]
--smbd=SMBD use specified smbd [$smbd] --smbd=SMBD use specified smbd [$smbd]
@ -950,11 +941,6 @@ then
fi fi
fi fi
if ! has "$make"
then
error_exit "GNU make ($make) not found"
fi
if ! check_py_version "$python"; then if ! check_py_version "$python"; then
error_exit "Cannot use '$python', Python >= 3.7 is required." \ error_exit "Cannot use '$python', Python >= 3.7 is required." \
"Use --python=/path/to/python to specify a supported Python." \ "Use --python=/path/to/python to specify a supported Python." \
@ -1777,7 +1763,6 @@ if test "$container" != no; then
echo "RUNC=$runc" >> $config_host_mak echo "RUNC=$runc" >> $config_host_mak
fi fi
echo "ROMS=$roms" >> $config_host_mak echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak
@ -2030,7 +2015,6 @@ preserve_env CXXFLAGS
preserve_env LD preserve_env LD
preserve_env LDFLAGS preserve_env LDFLAGS
preserve_env LD_LIBRARY_PATH preserve_env LD_LIBRARY_PATH
preserve_env MAKE
preserve_env NM preserve_env NM
preserve_env OBJCFLAGS preserve_env OBJCFLAGS
preserve_env OBJCOPY preserve_env OBJCOPY

1
meson.build
View File

@ -4028,7 +4028,6 @@ summary(summary_info, bool_yn: true, section: 'Directories')
# Host binaries # Host binaries
summary_info = {} summary_info = {}
summary_info += {'git': config_host['GIT']} summary_info += {'git': config_host['GIT']}
summary_info += {'make': config_host['MAKE']}
summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())} summary_info += {'python': '@0@ (version: @1@)'.format(python.full_path(), python.language_version())}
summary_info += {'sphinx-build': sphinx_build} summary_info += {'sphinx-build': sphinx_build}
if config_host.has_key('HAVE_GDB_BIN') if config_host.has_key('HAVE_GDB_BIN')