From 7b5b93037d681e3540b5ddd8344435ee9cd5ba60 Mon Sep 17 00:00:00 2001 From: kavanabhat Date: Wed, 1 Dec 2021 19:30:40 +0530 Subject: [PATCH 1/2] Fix truncated assembler checks --- Makefile.system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.system b/Makefile.system index 3b55fb104..43a3d7c6c 100644 --- a/Makefile.system +++ b/Makefile.system @@ -15,7 +15,7 @@ ifeq ($(HOSTARCH), amd64) HOSTARCH=x86_64 endif -HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null) +HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo $$?) # Catch conflicting usage of ARCH in some BSD environments ifeq ($(ARCH), amd64) From 9a45b5123f413dfa7ddc4f57ebbdd0a511e3f96c Mon Sep 17 00:00:00 2001 From: kavanabhat Date: Thu, 2 Dec 2021 13:29:38 +0530 Subject: [PATCH 2/2] Update Makefile.system --- Makefile.system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system index 43a3d7c6c..c78500eb6 100644 --- a/Makefile.system +++ b/Makefile.system @@ -15,8 +15,6 @@ ifeq ($(HOSTARCH), amd64) HOSTARCH=x86_64 endif -HAVE_GAS := $(shell as -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo $$?) - # Catch conflicting usage of ARCH in some BSD environments ifeq ($(ARCH), amd64) override ARCH=x86_64 @@ -368,6 +366,8 @@ GCCMINORVERSIONGTEQ2 := $(shell expr `$(CC) $(GCCDUMPVERSION_PARAM) | cut -f2 -d GCCMINORVERSIONGTEQ7 := $(shell expr `$(CC) $(GCCDUMPVERSION_PARAM) | cut -f2 -d.` \>= 7) endif +HAVE_GAS := $(shell $(AS) -v < /dev/null 2>&1 | grep GNU 2>&1 >/dev/null ; echo $$?) + # # OS dependent settings #