From e2951636531c5bdcdb73581d3b5af7fef9363de5 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Tue, 17 Nov 2015 13:44:57 -0500 Subject: [PATCH] Settled GCC 4 stuff, I think. --- haiku/GNUosspecific.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/haiku/GNUosspecific.mk b/haiku/GNUosspecific.mk index db9fb51e..0c47b0fa 100644 --- a/haiku/GNUosspecific.mk +++ b/haiku/GNUosspecific.mk @@ -4,8 +4,10 @@ EXESUFFIX = LIBSUFFIX = .so OSHSUFFIX = .hpp -# TODO dynamically select the gcc4 compiler instead? gotta figure out how to do this on a GCC 2 Hybrid nightly +# Force GCC 4; GCC 2 is not supported. gccver = $(shell $(CC) --version | sed 's/-.*//g') ifeq ($(gccver),2.95.3) -$(error Sorry; GCC 4 is necessary to build libui for Haiku) + # TODO warn? + CC = gcc-x86 + CXX = g++-x86 endif