diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-03-17 21:20:49 -0700 |
|---|---|---|
| committer | Pirama Arumuga Nainar <pirama@google.com> | 2015-03-18 15:48:48 -0700 |
| commit | 6031993c913a493392a9579f92d201b468fa8bb2 (patch) | |
| tree | cd220c3657863506d93fb8c8f70aa62ff31120f0 /driver | |
| parent | 958d8b23ac969d13ea3da0a2d9a355f5951afa8c (diff) | |
| download | rs-6031993c913a493392a9579f92d201b468fa8bb2.tar.gz | |
Allow use of local CLANG to build runtime libs
When building runtime libs, allow use of a local clang build by using a
$LOCAL_CLANG. Directly clobbering $CLANG breaks other parts of the
build system that use that variable.
Change-Id: I0ac3a501dfa325b6e3b8675f43c11ddcdd846d41
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/runtime/build_bc_lib_internal.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/driver/runtime/build_bc_lib_internal.mk b/driver/runtime/build_bc_lib_internal.mk index 05cfbf7c..7204b752 100644 --- a/driver/runtime/build_bc_lib_internal.mk +++ b/driver/runtime/build_bc_lib_internal.mk @@ -49,6 +49,10 @@ bc_cflags := -MD \ $(bc_translated_clang_cc1_cflags) \ $(LOCAL_CFLAGS_$(my_32_64_bit_suffix)) +ifndef LOCAL_CLANG +LOCAL_CLANG := $(CLANG) +endif + ifeq ($(rs_debug_runtime),1) bc_cflags += -DRS_DEBUG_RUNTIME endif @@ -70,10 +74,10 @@ $(c_bc_files): PRIVATE_INCLUDES := \ external/clang/lib/Headers $(c_bc_files): PRIVATE_CFLAGS := $(bc_cflags) -$(c_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.c $(CLANG) +$(c_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.c $(LOCAL_CLANG) @echo "bc: $(PRIVATE_MODULE) <= $<" @mkdir -p $(dir $@) - $(hide) $(CLANG) $(addprefix -I, $(PRIVATE_INCLUDES)) $(PRIVATE_CFLAGS) $< -o $@ + $(hide) $(LOCAL_CLANG) $(addprefix -I, $(PRIVATE_INCLUDES)) $(PRIVATE_CFLAGS) $< -o $@ $(ll_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.ll $(LLVM_AS) @mkdir -p $(dir $@) |