diff options
Diffstat (limited to 'make/include')
| -rw-r--r-- | make/include/gcc.defs | 2 | ||||
| -rw-r--r-- | make/include/main.defs | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/make/include/gcc.defs b/make/include/gcc.defs index e6695c329..b27c4a6ce 100644 --- a/make/include/gcc.defs +++ b/make/include/gcc.defs @@ -83,7 +83,7 @@ GCC.args.extra.exe++ = $(LDFLAGS) define import.GCC $(1).GCC.gcc = $$(GCC.gcc) - $(1).GCC.gxx = $$(dir $$($(1).GCC.gcc))$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc))) + $(1).GCC.gxx = $$(dir $$($(1).GCC.gcc))$$(subst clang,clang++,$$(subst gcc,g++,$$(notdir $$($(1).GCC.gcc)))) $(1).GCC.pipe = $$(GCC.pipe) $(1).GCC.c_std = $$(GCC.c_std) diff --git a/make/include/main.defs b/make/include/main.defs index 504d814cc..a6ea8a4cd 100644 --- a/make/include/main.defs +++ b/make/include/main.defs @@ -12,17 +12,27 @@ ifeq (1,$(FEATURE.local_pkgconfig)) MODULES += contrib/pkgconfig endif +HB_TOOLS_PATH = +ifeq (1,$(FEATURE.local_cmake)) + MODULES += contrib/cmake + HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) +endif + ifeq (1,$(FEATURE.local_autotools)) MODULES += contrib/autoconf MODULES += contrib/automake MODULES += contrib/libtool MODULES += contrib/m4 AUTOTOOL_MODULES = AUTOCONF AUTOMAKE LIBTOOL M4 - PATH := $(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH) + HB_TOOLS_PATH = $(call fn.ABSOLUTE,$(CONTRIB.build/)bin) else AUTOTOOL_MODULES = endif +ifneq (,$(HB_TOOLS_PATH)) + PATH := $(HB_TOOLS_PATH):$(PATH) +endif + ifneq (,$(filter $(BUILD.system),cygwin mingw)) ifneq ($(HAS.bz2),1) MODULES += contrib/bzip2 |