From 1bff209a176684a916be4335a5edd5cc4faa2afe Mon Sep 17 00:00:00 2001 From: Jim Saxton Date: Thu, 4 Feb 2016 11:38:18 -0800 Subject: [PATCH] Detect gcc version and modify LD to allow x86 and x86_gcc2 to compile. --- src/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index f132dd7..6a29aa0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -42,7 +42,14 @@ GCC = gcc GCC_OPT = $(DBG) $(OPT) -I. -I/boot/home/config/include/ -I/boot/home/config/include/ncurses/ -DHAVE_CONFIG -DUNIX $(HAIKUOPT) GPP = g++ GPP_OPT = $(DBG) $(OPT) -I. -DHAVE_CONFIG -DUNIX $(HAIKUOPT) -LD = ld +GCC_VER_GTE48 := $(shell echo `gcc -dumpversion | cut -f1-2 -d.` \>= 4.8 | bc ) +ifeq ($(GCC_VER_GTE48),1) + LD = gcc +else + LD = ld +endif + + LD_OPT = -shared ##