From ecae349e19834b2cd23037bd10aee1efe8ef1c28 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 8 Jan 2018 17:28:17 -0800 Subject: [PATCH] Switch to build-tools bison Test: m Test: mma external/dtc Change-Id: Ia8e837f77238cb07e23de24f98c77aba9ff0f8dd --- core/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/config.mk b/core/config.mk index b03f21f99..4fc5edf03 100644 --- a/core/config.mk +++ b/core/config.mk @@ -609,13 +609,13 @@ ZIPTIME := $(prebuilt_build_tools_bin)/ziptime LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39 # The default PKGDATADIR built in the prebuilt bison is a relative path -# external/bison/data. +# prebuilts/build-tools/common/bison. # To run bison from elsewhere you need to set up enviromental variable # BISON_PKGDATADIR. -BISON_PKGDATADIR := $(PWD)/external/bison/data -BISON := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bison/bison +BISON_PKGDATADIR := $(PWD)/prebuilts/build-tools/common/bison +BISON := prebuilts/build-tools/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/bin/bison YACC := $(BISON) -d -BISON_DATA := $(wildcard external/bison/data/* external/bison/data/*/*) +BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*) YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm