From aaf15b18f1733e9c52bf64a360b42b1d7515aac1 Mon Sep 17 00:00:00 2001 From: Tamas TEVESZ Date: Wed, 16 Sep 2015 10:24:00 +0200 Subject: [PATCH] 2015-09-16 10:20 UTC+0200 Tamas TEVESZ (ice extreme.hu) * config/global.mk + Allow autodetection of Clang as system compiler on FreeBSD 10+ ; Untested on, but should not affect, other BSDs or FreeBSD < 10. --- ChangeLog.txt | 5 +++++ config/global.mk | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 50eba097fe..78751ef589 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-09-16 10:20 UTC+0200 Tamas TEVESZ (ice extreme.hu) + * config/global.mk + + Allow autodetection of Clang as system compiler on FreeBSD 10+ + ; Untested on, but should not affect, other BSDs or FreeBSD < 10. + 2015-09-15 21:33 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rtl/hbproces.c * minor formatting diff --git a/config/global.mk b/config/global.mk index 4ee0bf767c..2ed9bcbde6 100644 --- a/config/global.mk +++ b/config/global.mk @@ -874,7 +874,18 @@ ifeq ($(HB_COMPILER),) endif endif else - ifneq ($(filter $(HB_PLATFORM),aix hpux bsd beos qnx cygwin),) + ifeq ($(HB_PLATFORM),bsd) + HB_COMP_PATH := $(call find_in_path_par,clang,/usr/bin) + ifneq ($(HB_COMP_PATH),) + HB_COMPILER := clang + else + HB_COMP_PATH := $(call find_in_path_par,gcc,/usr/bin) + ifneq ($(HB_COMP_PATH),) + HB_COMPILER := gcc + endif + endif + else + ifneq ($(filter $(HB_PLATFORM),aix hpux beos qnx cygwin),) HB_COMP_PATH := $(call find_in_path,gcc) ifneq ($(HB_COMP_PATH),) HB_COMPILER := gcc @@ -961,6 +972,7 @@ ifeq ($(HB_COMPILER),) endif endif endif + endif # autodetect watcom platform by looking at the header path config ifeq ($(HB_COMPILER),watcom)