tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am a9bd9981: am cf448ddb: Merge "Use gomacc even for FDO build"

Browse source 
* commit 'a9bd99816f768531f43367facc01fd140e43115a':
  Use gomacc even for FDO build
This commit is contained in:
Shinichiro Hamaji 2015-09-28 04:47:57 +00:00 committed by Android Git Automerger
commit 05ae340c25
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/binary.mk
View file

@ -254,9 +254,10 @@ ifneq ($(filter true always, $(LOCAL_FDO_SUPPORT)),)
my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_OPTIMIZE_CFLAGS)
my_fdo_build := true
endif
# Disable ccache (or other compiler wrapper).
my_cc_wrapper :=
my_cxx_wrapper :=
# Disable ccache (or other compiler wrapper) except gomacc, which
# can handle -fprofile-use properly.
my_cc_wrapper := $(filter $(GOMA_CC),$(my_cc_wrapper))
my_cxx_wrapper := $(filter $(GOMA_CC),$(my_cxx_wrapper))
endif
###########################################################

7
core/goma.mk
View file

@ -42,7 +42,7 @@ ifneq ($(USE_GOMA),)
goma_dir := $(HOME)/goma
endif
goma_ctl := $(goma_dir)/goma_ctl.py
goma_cc := $(goma_dir)/gomacc
GOMA_CC := $(goma_dir)/gomacc
$(if $(wildcard $(goma_ctl)),, \
$(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \
@ -50,15 +50,14 @@ ifneq ($(USE_GOMA),)
# Append gomacc to existing *_WRAPPER variables so it's possible to
# use both ccache and gomacc.
CC_WRAPPER := $(strip $(CC_WRAPPER) $(goma_cc))
CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(goma_cc))
CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
# gomacc can start goma client's daemon process automatically, but
# it is safer and faster to start up it beforehand. We run this as a
# background process so this won't slow down the build.
$(shell $(goma_ctl) ensure_start &> /dev/null &)
goma_cc :=
goma_ctl :=
goma_dir :=
endif