Skip to content

Commit

Permalink
Use configure cache (project-chip#561)
Browse files Browse the repository at this point in the history
  • Loading branch information
Rob Walker authored Apr 30, 2020
1 parent 384547d commit 946b5ac
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile-Android
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ AMFILES = \
#
define configure-action
$(ECHO) " CONFIG $(ABI_CONFIG_TUPLE_$(1))..."
(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure \
(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure -C \
CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
Expand Down
2 changes: 1 addition & 1 deletion Makefile-Standalone
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ AMFILES = \
#
define configure-target
$(ECHO) " CONFIG $(1)..."
(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure \
(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure -C \
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
--prefix=/ \
--exec-prefix=/$(1) \
Expand Down
2 changes: 1 addition & 1 deletion Makefile-iOS
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ AMFILES = \
#
define configure-arch
$(ECHO) " CONFIG $(1)-$(TargetTuple)..."
(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure \
(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure -C \
CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
Expand Down
2 changes: 1 addition & 1 deletion config/efr32/efr32-chip.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ CHIP_CXXFLAGS = $(STD_CXXFLAGS) $(CXXFLAGS)
# ==================================================

CHIP_CONFIGURE_OPTIONS = \
AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
-C AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
CPPFLAGS="$(CHIP_CPPFLAGS)" \
CXXFLAGS="$(CHIP_CXXFLAGS)" \
Expand Down
2 changes: 1 addition & 1 deletion config/esp32/components/chip/component.mk
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ DoubleQuoteStr = $(QuoteChar)$(subst $(QuoteChar),\$(QuoteChar),$(subst \,\\,$(1
# ESP-IDF's project.mk fails to define RANLIB appropriately, so we define it here.
RANLIB := $(call dequote,$(CONFIG_TOOLPREFIX))ranlib

CONFIGURE_OPTIONS := AR="$(AR)" CC="$(CC)" CXX="$(CXX)" LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" \
CONFIGURE_OPTIONS := -C AR="$(AR)" CC="$(CC)" CXX="$(CXX)" LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" \
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
CFLAGS=$(call DoubleQuoteStr, $(CFLAGS)) \
CPPFLAGS=$(call DoubleQuoteStr, $(CPPFLAGS)) \
Expand Down
1 change: 1 addition & 0 deletions config/nrf5/nrf5-chip.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ DoubleQuoteStr = $(QuoteChar)$(subst $(QuoteChar),\$(QuoteChar),$(subst \,\\,$(1
# ==================================================

CHIP_CONFIGURE_OPTIONS = \
-C \
AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
CPPFLAGS=$(call DoubleQuoteStr, $(CHIP_CPPFLAGS)) \
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ be run again for the changes to be picked up.
mkdir build/<CONFIG>
cd build/<CONFIG>
../../configure <CONFIG ARGUMENTS>
../../configure -C <CONFIG ARGUMENTS>
```

Where `<CONFIG>` is something that describes what configuration (as described by
Expand Down

0 comments on commit 946b5ac

Please sign in to comment.