commit 09295a82f8db8f3e699b3089f7d93565a82b72ca
author Shinichiro Hamaji <hamaji@google.com> Thu Sep 24 17:51:20 2015 +0900
committer Shinichiro Hamaji <hamaji@google.com> Sat Sep 26 12:01:21 2015 +0900
tree 34fcbe08696ff5f9dfabb9e9eaac71321ee4cc9d
parent 094116f0374da3dcba3ff1425f0cb42caf1c6d59

Use gomacc even for FDO build

Goma's client recognizes -fprofile-use= flag so shoulde be
compatible with Android's FDO build.

Change-Id: I0d21d6f530cd05770f8dc12e9dc33a5db49a9c7d

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 093cc38..403cff5 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -254,9 +254,10 @@
     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
 
 ###########################################################