From d28334bd24762f88217bb8d5afdebe42000360b4 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Wed, 30 Dec 2020 22:18:28 -0800 Subject: [PATCH] Fix makefile fragment for linux on arm (#147) * Update comments describing configuration this makefile fragment supports. * Remove extra compiler options for suggested gcc build * Remove unnecessary -m32 option for suggested clang build * switch default compiler from clang to gcc --- bin/makefile-linux.armv7l-x | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/makefile-linux.armv7l-x b/bin/makefile-linux.armv7l-x index 50582e9..7636fad 100644 --- a/bin/makefile-linux.armv7l-x +++ b/bin/makefile-linux.armv7l-x @@ -1,7 +1,8 @@ -# Options for Linux, Intel 386/486 and X-Window +# Options for Linux, ARMv7 and X-Window + +CC = gcc $(GCC_CFLAGS) +#CC = clang $(CLANG_CFLAGS) -#CC = gcc -m32 $(GCC_CFLAGS) -fno-omit-frame-pointer -Wall -Wextra -fno-aggressive-loop-optimizations -CC = clang -m32 $(CLANG_CFLAGS) XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xbbt.o \ $(OBJECTDIR)dspif.o \ @@ -12,7 +13,6 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xrdopt.o \ $(OBJECTDIR)xwinman.o - XFLAGS = -DXWINDOW -DNOPIXRECT # This is to make the %$#@! Apollo cc happy