tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom
nixpkgs / pkgs / os-specific / linux / kernel-headers / no-dynamic-cc-version-check.patch
at release-19.03 32 lines 1.2 kB view raw
1diff --git a/Makefile b/Makefile 2index 863f58503bee..b778d5023208 100644 3--- a/Makefile 4+++ b/Makefile 5@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) 6 KBUILD_AFLAGS += $(call cc-option,-fno-PIE) 7 8 # check for 'asm goto' 9-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) 10 CC_HAVE_ASM_GOTO := 1 11 KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO 12 KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO 13-endif 14 15 # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. 16 # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. 17diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include 18index 065324a8046f..d09c67194549 100644 19--- a/scripts/Kbuild.include 20+++ b/scripts/Kbuild.include 21@@ -216,11 +216,8 @@ cc-disable-warning = $(call try-run-cached,\ 22 cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) 23 24 # cc-version 25-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) 26 27 # cc-fullversion 28-cc-fullversion = $(shell $(CONFIG_SHELL) \ 29- $(srctree)/scripts/gcc-version.sh -p $(CC)) 30 31 # cc-ifversion 32 # Usage: EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)