• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javaandroidc++linuxc#objective-ccocoa誰得qtrubybathyscaphegamephpguicwindows翻訳pythonomegattwitterframeworkbtronarduinovb.net計画中(planning stage)directxpreviewertestゲームエンジンdom

build


Commit MetaInfo

Revisionb7da831d8094c48cbf507550453cbc3463d5dabe (tree)
Zeit2017-10-04 17:42:43
AutorXiNGRZ <chenxingyu92@gmai...>
CommiterXiNGRZ

Log Message

core: Prefix and build bison host executable if needed

This patch prefixed bison with HOST_OUT_EXECUTABLES to ensure using our
bison built from source. It also added bison to be a depencency of %.y
and %.yy tasks so that it will be built if needed without any manual
mka bison.

Change-Id: Ic207124965c704b3f350e96b58d8e1f2683c2601

Ändern Zusammenfassung

Diff

--- a/core/binary.mk
+++ b/core/binary.mk
@@ -891,7 +891,7 @@ y_yacc_cs := $(addprefix \
891891 ifneq ($(y_yacc_cs),)
892892 $(y_yacc_cs): $(intermediates)/%.c: \
893893 $(TOPDIR)$(LOCAL_PATH)/%.y \
894- $(my_additional_dependencies)
894+ $(my_additional_dependencies) | $(BISON)
895895 $(call transform-y-to-c-or-cpp)
896896 $(call track-src-file-gen,$(y_yacc_sources),$(y_yacc_cs))
897897
@@ -904,7 +904,7 @@ yy_yacc_cpps := $(addprefix \
904904 ifneq ($(yy_yacc_cpps),)
905905 $(yy_yacc_cpps): $(intermediates)/%$(LOCAL_CPP_EXTENSION): \
906906 $(TOPDIR)$(LOCAL_PATH)/%.yy \
907- $(my_additional_dependencies)
907+ $(my_additional_dependencies) | $(BISON)
908908 $(call transform-y-to-c-or-cpp)
909909 $(call track-src-file-gen,$(yy_yacc_sources),$(yy_yacc_cpps))
910910
--- a/core/config.mk
+++ b/core/config.mk
@@ -535,7 +535,7 @@ endif
535535 # BISON_PKGDATADIR.
536536 BISON_PKGDATADIR := $(PWD)/external/bison/data
537537 ifeq ($(USE_HOST_BISON),yes)
538-BISON := bison
538+BISON := $(HOST_OUT_EXECUTABLES)/bison
539539 else
540540 BISON := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bison/bison
541541 endif