diff --git a/configure b/configure index 0e93058489..d674a96673 100755 --- a/configure +++ b/configure @@ -400,20 +400,16 @@ gnu/kfreebsd) ;; freebsd) bsd="yes" - make="${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; dragonfly) bsd="yes" - make="${MAKE-gmake}" ;; netbsd) bsd="yes" - make="${MAKE-gmake}" ;; openbsd) bsd="yes" - make="${MAKE-gmake}" ;; darwin) bsd="yes" @@ -421,7 +417,6 @@ darwin) ;; sunos) solaris="yes" - make="${MAKE-gmake}" ;; haiku) pie="no" @@ -525,9 +520,6 @@ case "$cpu" in CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;; esac -: ${make=${MAKE-make}} - - check_py_version() { # We require python >= 3.7. # NB: a True python conditional creates a non-zero return code (Failure) @@ -630,7 +622,7 @@ for opt do ;; --objcc=*) ;; - --make=*) make="$optarg" + --make=*) ;; --install=*) ;; @@ -897,7 +889,6 @@ Advanced options (experts only): --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-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases - --make=MAKE use specified make [$make] --python=PYTHON use specified python [$python] --ninja=NINJA use specified ninja [$ninja] --smbd=SMBD use specified smbd [$smbd] @@ -950,11 +941,6 @@ then fi fi -if ! has "$make" -then - error_exit "GNU make ($make) not found" -fi - if ! check_py_version "$python"; then error_exit "Cannot use '$python', Python >= 3.7 is required." \ "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 fi echo "ROMS=$roms" >> $config_host_mak -echo "MAKE=$make" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "MESON=$meson" >> $config_host_mak @@ -2030,7 +2015,6 @@ preserve_env CXXFLAGS preserve_env LD preserve_env LDFLAGS preserve_env LD_LIBRARY_PATH -preserve_env MAKE preserve_env NM preserve_env OBJCFLAGS preserve_env OBJCOPY diff --git a/meson.build b/meson.build index 884b16c749..2d48aa1e2e 100644 --- a/meson.build +++ b/meson.build @@ -4028,7 +4028,6 @@ summary(summary_info, bool_yn: true, section: 'Directories') # Host binaries summary_info = {} 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 += {'sphinx-build': sphinx_build} if config_host.has_key('HAVE_GDB_BIN')