From 89fa3d0d0c501208516751e6c7c604523c96456c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 25 May 2019 17:44:53 +0200
Subject: kbuild: account for recent upstream changes

Apparently cdd750bfb1f76fe9be8cfb53cbe77b2e811081ab changed things, so
we fall back onto this hack.

Reported-by: Alex Xu <alex@alxu.ca>
---
 src/compat/Kbuild.include | 20 ++++++++++----------
 src/crypto/Kbuild.include |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include
index 403b69a..34398dc 100644
--- a/src/compat/Kbuild.include
+++ b/src/compat/Kbuild.include
@@ -8,37 +8,37 @@ ccflags-y += -include $(kbuild-dir)/compat/compat.h
 asflags-y += -include $(kbuild-dir)/compat/compat-asm.h
 
 ifeq ($(wildcard $(srctree)/include/linux/ptr_ring.h),)
-ccflags-y += -I$(src)/compat/ptr_ring/include
+ccflags-y += -I$(kbuild-dir)/compat/ptr_ring/include
 endif
 
 ifeq ($(wildcard $(srctree)/include/linux/siphash.h),)
-ccflags-y += -I$(src)/compat/siphash/include
+ccflags-y += -I$(kbuild-dir)/compat/siphash/include
 wireguard-y += compat/siphash/siphash.o
 endif
 
 ifeq ($(wildcard $(srctree)/include/net/dst_cache.h),)
-ccflags-y += -I$(src)/compat/dst_cache/include
+ccflags-y += -I$(kbuild-dir)/compat/dst_cache/include
 wireguard-y += compat/dst_cache/dst_cache.o
 endif
 
 ifeq ($(wildcard $(srctree)/arch/x86/include/asm/intel-family.h)$(CONFIG_X86),y)
-ccflags-y += -I$(src)/compat/intel-family-x86/include
+ccflags-y += -I$(kbuild-dir)/compat/intel-family-x86/include
 endif
 
 ifeq ($(wildcard $(srctree)/arch/x86/include/asm/fpu/api.h)$(CONFIG_X86),y)
-ccflags-y += -I$(src)/compat/fpu-x86/include
+ccflags-y += -I$(kbuild-dir)/compat/fpu-x86/include
 endif
 
 ifeq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/simd.h)$(shell grep -s -F "generic-y += simd.h" "$(srctree)/arch/$(SRCARCH)/Kbuild" "$(srctree)/arch/$(SRCARCH)/Makefile"),)
-ccflags-y += -I$(src)/compat/simd-asm/include
+ccflags-y += -I$(kbuild-dir)/compat/simd-asm/include
 endif
 
 ifeq ($(wildcard $(srctree)/include/linux/simd.h),)
-ccflags-y += -I$(src)/compat/simd/include
+ccflags-y += -I$(kbuild-dir)/compat/simd/include
 endif
 
 ifeq ($(wildcard $(srctree)/include/net/udp_tunnel.h),)
-ccflags-y += -I$(src)/compat/udp_tunnel/include
+ccflags-y += -I$(kbuild-dir)/compat/udp_tunnel/include
 wireguard-y += compat/udp_tunnel/udp_tunnel.o
 endif
 
@@ -48,10 +48,10 @@ wireguard-y += compat/memneq/memneq.o
 endif
 
 ifeq ($(wildcard $(srctree)/arch/arm/include/asm/neon.h)$(CONFIG_ARM),y)
-ccflags-y += -I$(src)/compat/neon-arm/include
+ccflags-y += -I$(kbuild-dir)/compat/neon-arm/include
 endif
 ifeq ($(wildcard $(srctree)/arch/arm64/include/asm/neon.h)$(CONFIG_ARM64),y)
-ccflags-y += -I$(src)/compat/neon-arm/include
+ccflags-y += -I$(kbuild-dir)/compat/neon-arm/include
 endif
 
 ifeq ($(CONFIG_X86_64),y)
diff --git a/src/crypto/Kbuild.include b/src/crypto/Kbuild.include
index 460684d..f2a312e 100644
--- a/src/crypto/Kbuild.include
+++ b/src/crypto/Kbuild.include
@@ -48,7 +48,7 @@ targets := $(patsubst $(kbuild-dir)/%.pl,%.S,$(wildcard $(patsubst %.o,$(kbuild-
 .SECONDARY:
 
 wireguard-y += $(addprefix crypto/zinc/,$(zinc-y))
-ccflags-y += -I$(src)/crypto/include
+ccflags-y += -I$(kbuild-dir)/crypto/include
 ccflags-$(CONFIG_ZINC_ARCH_X86_64) += -DCONFIG_ZINC_ARCH_X86_64
 ccflags-$(CONFIG_ZINC_ARCH_ARM) += -DCONFIG_ZINC_ARCH_ARM
 ccflags-$(CONFIG_ZINC_ARCH_ARM64) += -DCONFIG_ZINC_ARCH_ARM64
-- 
cgit v1.2.3-59-g8ed1b