diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-23 23:23:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-10-24 08:20:53 -0400 |
| commit | bbd12f558367034c77c68795c88b01b9cf5705dd (patch) | |
| tree | de93cbfef38b2fea9be2987f7d22d633f7991363 /pkgs/os-specific/linux/kernel-headers | |
| parent | 22df9423cd1f87b4390e9f7879636ecd0c508d96 (diff) | |
| parent | d3f328e59218b7bd2240dd5aeca3565ee7b2045f (diff) | |
| download | nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar.gz nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar.bz2 nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar.lz nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar.xz nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.tar.zst nixlib-bbd12f558367034c77c68795c88b01b9cf5705dd.zip | |
Merge remote-tracking branch 'upstream/master' into darwin-to-linux-cross
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch | 20 |
2 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 3f0b8e9b3593..011668f0c679 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -84,8 +84,8 @@ let in { linuxHeaders = common { - version = "4.15"; - sha256 = "0sd7l9n9h7vf9c6gd6ciji28hawda60yj0llh17my06m0s4lf9js"; + version = "4.18.3"; + sha256 = "1m23hjd02bg8mqnd8dc4z4m3kxds1cyrc6j5saiwnhzbz373rvc1"; # TODO make unconditional next mass rebuild patches = lib.optionals (stdenvNoCC.hostPlatform != stdenvNoCC.buildPlatform) [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch index b69dc65e1587..9b582cac7153 100644 --- a/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch +++ b/pkgs/os-specific/linux/kernel-headers/no-dynamic-cc-version-check.patch @@ -1,3 +1,19 @@ +diff --git a/Makefile b/Makefile +index 863f58503bee..b778d5023208 100644 +--- a/Makefile ++++ b/Makefile +@@ -501,11 +501,9 @@ KBUILD_CFLAGS += $(call cc-option,-fno-PIE) + KBUILD_AFLAGS += $(call cc-option,-fno-PIE) + + # check for 'asm goto' +-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) + CC_HAVE_ASM_GOTO := 1 + KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO + KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO +-endif + + # The expansion should be delayed until arch/$(SRCARCH)/Makefile is included. + # Some architectures define CROSS_COMPILE in arch/$(SRCARCH)/Makefile. diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 065324a8046f..d09c67194549 100644 --- a/scripts/Kbuild.include @@ -6,10 +22,10 @@ index 065324a8046f..d09c67194549 100644 cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc) # cc-version --cc-version = $(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) +-cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC)) # cc-fullversion --cc-fullversion = $(call shell-cached,$(CONFIG_SHELL) \ +-cc-fullversion = $(shell $(CONFIG_SHELL) \ - $(srctree)/scripts/gcc-version.sh -p $(CC)) # cc-ifversion |