blob: 1c28b28cd9cf7c73f83ad1cdcdb5bc42d1a23e16 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
Accept absolute paths for $compiler variable (and so for $CC)
--- build/common.inc.orig 2016-09-22 10:28:03.000000000 +0000
+++ build/common.inc 2017-01-05 21:44:56.121147000 +0000
@@ -106,17 +106,17 @@
target:=$(tbb_os)
endif
# process host/target compiler-dependent build configuration
- ifeq (,$(wildcard $(tbb_root)/build/$(target).$(compiler).inc))
- $(error "$(compiler)" is not supported on $(target). Add build/$(target).$(compiler).inc file with compiler-specific settings. )
+ ifeq (,$(wildcard $(tbb_root)/build/$(target).$(notdir $(compiler)).inc))
+ $(error "$(notdir $(compiler))" is not supported on $(target). Add build/$(target).$(notdir $(compiler)).inc file with compiler-specific settings. )
endif
- include $(tbb_root)/build/$(target).$(compiler).inc
+ include $(tbb_root)/build/$(target).$(notdir $(compiler)).inc
endif
ifneq ($(BUILDING_PHASE),1)
# definitions for top-level Makefiles
origin_build_dir:=$(origin tbb_build_dir)
tbb_build_dir?=$(tbb_root)$(SLASH)build
- export tbb_build_prefix?=$(tbb_os)_$(arch)_$(compiler)_$(runtime)$(CPF_SUFFIX)
+ export tbb_build_prefix?=$(tbb_os)_$(arch)_$(notdir $(compiler))_$(runtime)$(CPF_SUFFIX)
work_dir=$(tbb_build_dir)$(SLASH)$(tbb_build_prefix)
endif # BUILDING_PHASE != 1
|
