p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix path to flex and bison with SANITIZE_HOST"

This commit is contained in:
Dan Willemsen 2018-05-26 01:29:55 +00:00 committed by Gerrit Code Review
parent 6fe15a380d 3de78fdf35
commit 80ebd01032
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config.mk
View File

@ -552,8 +552,9 @@ prebuilt_sdk_tools_bin := $(prebuilt_sdk_tools)/$(HOST_OS)/bin
prebuilt_build_tools := prebuilts/build-tools prebuilt_build_tools := prebuilts/build-tools
prebuilt_build_tools_wrappers := prebuilts/build-tools/common/bin prebuilt_build_tools_wrappers := prebuilts/build-tools/common/bin
prebuilt_build_tools_jars := prebuilts/build-tools/common/framework prebuilt_build_tools_jars := prebuilts/build-tools/common/framework
prebuilt_build_tools_bin_noasan := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin
ifeq ($(filter address,$(SANITIZE_HOST)),) ifeq ($(filter address,$(SANITIZE_HOST)),)
prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/bin prebuilt_build_tools_bin := $(prebuilt_build_tools_bin_noasan)
else else
prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin prebuilt_build_tools_bin := $(prebuilt_build_tools)/$(HOST_PREBUILT_TAG)/asan/bin
endif endif
@ -623,13 +624,13 @@ ZIPTIME := $(prebuilt_build_tools_bin)/ziptime
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Generic tools. # Generic tools.
LEX := $(prebuilt_build_tools_bin)/flex LEX := $(prebuilt_build_tools_bin_noasan)/flex
# The default PKGDATADIR built in the prebuilt bison is a relative path # The default PKGDATADIR built in the prebuilt bison is a relative path
# prebuilts/build-tools/common/bison. # prebuilts/build-tools/common/bison.
# To run bison from elsewhere you need to set up enviromental variable # To run bison from elsewhere you need to set up enviromental variable
# BISON_PKGDATADIR. # BISON_PKGDATADIR.
BISON_PKGDATADIR := $(PWD)/prebuilts/build-tools/common/bison BISON_PKGDATADIR := $(PWD)/prebuilts/build-tools/common/bison
BISON := $(prebuilt_build_tools_bin)/bison BISON := $(prebuilt_build_tools_bin_noasan)/bison
YACC := $(BISON) -d YACC := $(BISON) -d
BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*) BISON_DATA := $(wildcard $(BISON_PKGDATADIR)/* $(BISON_PKGDATADIR)/*/*)