aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2022-11-12 08:56:52 +0000
committerRon Yorston <rmy@pobox.com>2022-11-12 08:56:52 +0000
commit80732e16e0a73965287a4d31c95831035743c484 (patch)
tree495d0e409370823c3a5ebcf570a4942a06c4c4ac
parentf261d2d278537e6f0ca50cda68f0c3f768a56e40 (diff)
downloadbusybox-w32-80732e16e0a73965287a4d31c95831035743c484.tar.gz
busybox-w32-80732e16e0a73965287a4d31c95831035743c484.tar.bz2
busybox-w32-80732e16e0a73965287a4d31c95831035743c484.zip
build system: try harder to detect w64devkit
We need to build the supplied PDCurses code when using w64devkit. This was being detected by checking for the W64DEVKIT environment variable, but this is only defined if w64devkit is started via w64devkit.exe. Set W64DEVKIT ourselves if HOSTCC targets the mingw32 platform. This won't be the case when cross-compiling on Linux but will for w64devkit and MSYS2 MINGW32/64. The build won't work properly for MSYS2 MINGW32/64, but it doesn't work when using the supplied curses library either. 'make menuconfig' requires the use of MSYS2 MSYS, and HOSTCC there targets msys.
-rw-r--r--scripts/kconfig/Makefile11
1 files changed, 11 insertions, 0 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e0d7e2190..ed07c4c62 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -2,6 +2,17 @@
2# Kernel configuration targets 2# Kernel configuration targets
3# These targets are used from top-level makefile 3# These targets are used from top-level makefile
4 4
5# If w64devkit isn't run via w64devkit.exe W64DEVKIT won't be
6# defined. If HOSTCC targets the mingw32 platform set W64DEVKIT.
7ifndef W64DEVKIT
8 host_target := $(shell $(HOSTCC) -v 2>&1 | grep ^Target:)
9 host_platform := $(lastword $(subst -, ,$(host_target)))
10 ifeq ($(host_platform),mingw32)
11 W64DEVKIT := 1
12 export W64DEVKIT
13 endif
14endif
15
5PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config 16PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
6 17
7xconfig: $(obj)/qconf 18xconfig: $(obj)/qconf