Merge tag 'kbuild-fixes-v5.8-3' of... (1c8594b8) · Commits · 戴 / test

Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ ifneq ($(shell $(CC) --version 2>&1 \| head -n 1 \| grep clang),)
		ifneq ($(CROSS_COMPILE),)
		CLANG_FLAGS += --target=$(notdir $(CROSS_COMPILE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		@@ -1754,7 +1754,7 @@ PHONY += descend $(build-dirs)
		descend: $(build-dirs)
		$(build-dirs): prepare
		$(Q)$(MAKE) $(build)=$@ \
		single-build=$(if $(filter-out $@/, $(filter $@/%, $(single-no-ko))),1) \
		single-build=$(if $(filter-out $@/, $(filter $@/%, $(KBUILD_SINGLE_TARGETS))),1) \
		need-builtin=1 need-modorder=1

		clean-dirs := $(addprefix _clean_, $(clean-dirs))

+10 −2

Original line number	Diff line number	Diff line
		@@ -138,11 +138,19 @@ char read_text_file(const char filename)

		char get_line(char *stringp)
		{
		char orig = stringp, *next;

		/* do not return the unwanted extra line at EOF */
		if (stringp && *stringp == '\0')
		if (!orig \|\| *orig == '\0')
		return NULL;

		return strsep(stringp, "\n");
		next = strchr(orig, '\n');
		if (next)
		*next++ = '\0';

		*stringp = next;

		return orig;
		}

		/* A list of all modules we processed */