Skip to content

Commit 9d36117

Browse files
committed
kbuild: unify no-compiler-targets and no-sync-config-targets
Now that vdso_install does not depend on any in-tree build artifact, it no longer needs a compiler, making no-compiler-targets the same as no-sync-config-targets. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent 56769ba commit 9d36117

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

Makefile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -277,18 +277,13 @@ no-dot-config-targets := $(clean-targets) \
277277
$(version_h) headers headers_% archheaders archscripts \
278278
%asm-generic kernelversion %src-pkg dt_binding_check \
279279
outputmakefile rustavailable rustfmt rustfmtcheck
280-
# Installation targets should not require compiler. Unfortunately, vdso_install
281-
# is an exception where build artifacts may be updated. This must be fixed.
282-
no-compiler-targets := $(no-dot-config-targets) install dtbs_install \
283-
headers_install modules_install modules_sign kernelrelease image_name
284280
no-sync-config-targets := $(no-dot-config-targets) %install modules_sign kernelrelease \
285281
image_name
286282
single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/
287283

288284
config-build :=
289285
mixed-build :=
290286
need-config := 1
291-
need-compiler := 1
292287
may-sync-config := 1
293288
single-build :=
294289

@@ -298,18 +293,14 @@ ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
298293
endif
299294
endif
300295

301-
ifneq ($(filter $(no-compiler-targets), $(MAKECMDGOALS)),)
302-
ifeq ($(filter-out $(no-compiler-targets), $(MAKECMDGOALS)),)
303-
need-compiler :=
304-
endif
305-
endif
306-
307296
ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)
308297
ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)
309298
may-sync-config :=
310299
endif
311300
endif
312301

302+
need-compiler := $(may-sync-config)
303+
313304
ifneq ($(KBUILD_EXTMOD),)
314305
may-sync-config :=
315306
endif

0 commit comments

Comments
 (0)