Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf448ddb authored by Shinichiro Hamaji's avatar Shinichiro Hamaji Committed by Gerrit Code Review
Browse files

Merge "Use gomacc even for FDO build"

parents 581a028f 09295a82

core/binary.mk

+4 −3
Original line number Diff line number Diff line
@@ -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



###########################################################

core/goma.mk

+3 −4
Original line number Diff line number Diff line
@@ -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