From 2135c723299cb8b273e6c4eeff27801798800295 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 22 May 2019 14:01:09 +0200 Subject: [PATCH] remove gcc check completely, we have build dependencies for that RETPOLINE is now for sure included, further as this is build through buildpackage the build dependencies are checked Signed-off-by: Thomas Lamprecht --- Makefile | 16 +--------------- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 4128f16..8c5c2bb 100644 --- a/Makefile +++ b/Makefile @@ -29,12 +29,6 @@ GITVERSION:=$(shell git rev-parse HEAD) SKIPABI=0 -ifeq ($(CC), cc) -GCC=gcc -else -GCC=$(CC) -endif - BUILD_DIR=build KERNEL_SRC=ubuntu-disco @@ -57,17 +51,9 @@ LINUX_TOOLS_DEB=linux-tools-$(KERNEL_MAJMIN)_${KERNEL_VER}-${PKGREL}_${ARCH}.deb DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB} -all: check_gcc deb +all: deb deb: ${DEBS} -check_gcc: - $(GCC) --version|grep "8\.3" || false - @$(GCC) -Werror -mindirect-branch=thunk-extern -mindirect-branch-register -c -x c /dev/null -o check_gcc.o \ - || ( rm -f check_gcc.o; \ - echo "Please install gcc-6 packages with indirect thunk / RETPOLINE support"; \ - false) - @rm -f check_gcc.o - ${LINUX_TOOLS_DEB} ${HDR_DEB}: ${DST_DEB} ${DST_DEB}: ${BUILD_DIR}.prepared cd ${BUILD_DIR}; dpkg-buildpackage --jobs=auto -b -uc -us diff --git a/debian/control.in b/debian/control.in index e45f34a..ed01c62 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,7 +10,7 @@ Build-Depends: asciidoc-base, debhelper (>= 10~), file, flex, - gcc (>= 6.3.0-18+deb9u1), + gcc (>= 8.3.0-6), git, kmod, libdw-dev, -- 2.39.2