diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2015-03-19 15:47:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-19 15:47:59 +0000 |
| commit | a129d75fc16e4aa35d04c0105ba2166aa5d512d3 (patch) | |
| tree | b38e2c453b070ae103c096b399058f6c5ea626cb /driver | |
| parent | edba011e6d3673198b2bdc5bd0ffb422537915b7 (diff) | |
| parent | 411f7ade6195293f9b86605b65bd6de39dfaed13 (diff) | |
| download | rs-a129d75fc16e4aa35d04c0105ba2166aa5d512d3.tar.gz | |
Merge "Revert "Allow use of local CLANG to build runtime libs""
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/runtime/build_bc_lib_internal.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/driver/runtime/build_bc_lib_internal.mk b/driver/runtime/build_bc_lib_internal.mk index 7204b752..05cfbf7c 100644 --- a/driver/runtime/build_bc_lib_internal.mk +++ b/driver/runtime/build_bc_lib_internal.mk @@ -49,10 +49,6 @@ 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 @@ -74,10 +70,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 $(LOCAL_CLANG) +$(c_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.c $(CLANG) @echo "bc: $(PRIVATE_MODULE) <= $<" @mkdir -p $(dir $@) - $(hide) $(LOCAL_CLANG) $(addprefix -I, $(PRIVATE_INCLUDES)) $(PRIVATE_CFLAGS) $< -o $@ + $(hide) $(CLANG) $(addprefix -I, $(PRIVATE_INCLUDES)) $(PRIVATE_CFLAGS) $< -o $@ $(ll_bc_files): $(intermediates)/%.bc: $(LOCAL_PATH)/%.ll $(LLVM_AS) @mkdir -p $(dir $@) |