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 <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 4128f166f3183dff9be9beb86b694f0af40ae66b..8c5c2bb8e6b15bd188fddc96af8b5b1981916493 100644 (file)
--- 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 e45f34abe2808e89a6926b3c979440eeb2e857b8..ed01c6203777c53ef34174d75fb040f1e9b167d5 100644 (file)
--- 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,