|
436 | 436 | HOSTCC = gcc |
437 | 437 | HOSTCXX = g++ |
438 | 438 | endif |
| 439 | +HOSTPKG_CONFIG = pkg-config |
439 | 440 |
|
440 | 441 | KBUILD_USERHOSTCFLAGS := -Wall -Wmissing-prototypes -Wstrict-prototypes \ |
441 | 442 | -O2 -fomit-frame-pointer -std=gnu11 \ |
@@ -533,7 +534,7 @@ KBUILD_LDFLAGS_MODULE := |
533 | 534 | KBUILD_LDFLAGS := |
534 | 535 | CLANG_FLAGS := |
535 | 536 |
|
536 | | -export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC |
| 537 | +export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE LD CC HOSTPKG_CONFIG |
537 | 538 | export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL |
538 | 539 | export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX |
539 | 540 | export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD |
@@ -1294,11 +1295,12 @@ scripts_unifdef: scripts_basic |
1294 | 1295 | # Install |
1295 | 1296 |
|
1296 | 1297 | # Many distributions have the custom install script, /sbin/installkernel. |
1297 | | -# If DKMS is installed, 'make install' will eventually recuses back |
1298 | | -# to the this Makefile to build and install external modules. |
| 1298 | +# If DKMS is installed, 'make install' will eventually recurse back |
| 1299 | +# to this Makefile to build and install external modules. |
1299 | 1300 | # Cancel sub_make_done so that options such as M=, V=, etc. are parsed. |
1300 | 1301 |
|
1301 | | -install: sub_make_done := |
| 1302 | +quiet_cmd_install = INSTALL $(INSTALL_PATH) |
| 1303 | + cmd_install = unset sub_make_done; $(srctree)/scripts/install.sh |
1302 | 1304 |
|
1303 | 1305 | # --------------------------------------------------------------------------- |
1304 | 1306 | # Tools |
@@ -1650,6 +1652,7 @@ help: |
1650 | 1652 | @echo ' 1: warnings which may be relevant and do not occur too often' |
1651 | 1653 | @echo ' 2: warnings which occur quite often but may still be relevant' |
1652 | 1654 | @echo ' 3: more obscure warnings, can most likely be ignored' |
| 1655 | + @echo ' e: warnings are being treated as errors' |
1653 | 1656 | @echo ' Multiple levels can be combined with W=12 or W=123' |
1654 | 1657 | @echo '' |
1655 | 1658 | @echo 'Execute "make" or "make all" to build all targets marked with [*] ' |
@@ -1792,7 +1795,8 @@ ifdef single-build |
1792 | 1795 |
|
1793 | 1796 | # .ko is special because modpost is needed |
1794 | 1797 | single-ko := $(sort $(filter %.ko, $(MAKECMDGOALS))) |
1795 | | -single-no-ko := $(sort $(patsubst %.ko,%.mod, $(MAKECMDGOALS))) |
| 1798 | +single-no-ko := $(filter-out $(single-ko), $(MAKECMDGOALS)) \ |
| 1799 | + $(foreach x, o mod, $(patsubst %.ko, %.$x, $(single-ko))) |
1796 | 1800 |
|
1797 | 1801 | $(single-ko): single_modpost |
1798 | 1802 | @: |
@@ -1848,7 +1852,7 @@ clean: $(clean-dirs) |
1848 | 1852 | -o -name '*.ko.*' \ |
1849 | 1853 | -o -name '*.dtb' -o -name '*.dtbo' -o -name '*.dtb.S' -o -name '*.dt.yaml' \ |
1850 | 1854 | -o -name '*.dwo' -o -name '*.lst' \ |
1851 | | - -o -name '*.su' -o -name '*.mod' \ |
| 1855 | + -o -name '*.su' -o -name '*.mod' -o -name '*.usyms' \ |
1852 | 1856 | -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ |
1853 | 1857 | -o -name '*.lex.c' -o -name '*.tab.[ch]' \ |
1854 | 1858 | -o -name '*.asn1.[ch]' \ |
|
0 commit comments