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

Commit 1d6506ca authored by Primiano Tucci's avatar Primiano Tucci Committed by Gerrit Code Review
Browse files

Merge "Introduce CC/CXX/JAVAC_WRAPPER to wrap the calls to the compiler."

parents 7f349dc9 994c84fb

core/combo/javac.mk

+8 −1
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ else 
JAVACC := $(ALTERNATE_JAVAC)

endif



# The actual compiler can be wrapped by setting the JAVAC_WRAPPER var.

ifdef JAVAC_WRAPPER

    ifneq ($(JAVAC_WRAPPER),$(firstword $(JAVACC)))

        JAVACC := $(JAVAC_WRAPPER) $(JAVACC)

    endif

endif



# Whatever compiler is on this system.

ifeq ($(BUILD_OS), windows)

    COMMON_JAVAC := development/host/windows/prebuilt/javawrap.exe -J-Xmx256m \

core/combo/select.mk

+14 −7
Original line number Diff line number Diff line
@@ -92,13 +92,20 @@ ifneq ($(USE_CCACHE),) 
  # Check that the executable is here.

  ccache := $(strip $(wildcard $(ccache)))

  ifdef ccache

    # prepend ccache if necessary

    ifneq ($(ccache),$(firstword $($(combo_var_prefix)CC)))

      $(combo_var_prefix)CC := $(ccache) $($(combo_var_prefix)CC)

    CC_WRAPPER ?= $(ccache)

    CXX_WRAPPER ?= $(ccache)

    ccache =

  endif

    ifneq ($(ccache),$(firstword $($(combo_var_prefix)CXX)))

      $(combo_var_prefix)CXX := $(ccache) $($(combo_var_prefix)CXX)

endif

    ccache =



# The C/C++ compiler can be wrapped by setting the CC/CXX_WRAPPER vars.

ifdef CC_WRAPPER

  ifneq ($(CC_WRAPPER),$(firstword $($(combo_var_prefix)CC)))

    $(combo_var_prefix)CC := $(CC_WRAPPER) $($(combo_var_prefix)CC)

  endif

endif

ifdef CXX_WRAPPER

  ifneq ($(CXX_WRAPPER),$(firstword $($(combo_var_prefix)CXX)))

    $(combo_var_prefix)CXX := $(CXX_WRAPPER) $($(combo_var_prefix)CXX)

  endif

endif