Skip to content

Commit 946b5ac

Browse files
author
Rob Walker
authored
Use configure cache (project-chip#561)
1 parent 384547d commit 946b5ac

File tree

7 files changed

+7
-6
lines changed

7 files changed

+7
-6
lines changed

Makefile-Android

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ AMFILES = \
242242
#
243243
define configure-action
244244
$(ECHO) " CONFIG $(ABI_CONFIG_TUPLE_$(1))..."
245-
(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure \
245+
(cd $(BuildPath)/$(ABI_CONFIG_TUPLE_$(1)) && $(AbsTopSourceDir)/configure -C \
246246
CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
247247
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
248248
CPPFLAGS="$(CPPFLAGS)" \

Makefile-Standalone

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ AMFILES = \
245245
#
246246
define configure-target
247247
$(ECHO) " CONFIG $(1)..."
248-
(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure \
248+
(cd $(BuildPath)/$(1) && $(AbsTopSourceDir)/configure -C \
249249
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
250250
--prefix=/ \
251251
--exec-prefix=/$(1) \

Makefile-iOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ AMFILES = \
257257
#
258258
define configure-arch
259259
$(ECHO) " CONFIG $(1)-$(TargetTuple)..."
260-
(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure \
260+
(cd $(BuildPath)/$(1)-$(TargetTuple) && $(AbsTopSourceDir)/configure -C \
261261
CPP="$(CPP)" CC="$(CC)" CXX="$(CXX)" OBJC="$(OBJC)" OBJCXX="$(OBJCXX)" AR="$(AR)" RANLIB="$(RANLIB)" NM="$(NM)" STRIP="$(STRIP)" \
262262
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
263263
CPPFLAGS="$(CPPFLAGS)" \

config/efr32/efr32-chip.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ CHIP_CXXFLAGS = $(STD_CXXFLAGS) $(CXXFLAGS)
8686
# ==================================================
8787

8888
CHIP_CONFIGURE_OPTIONS = \
89-
AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
89+
-C AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
9090
LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
9191
CPPFLAGS="$(CHIP_CPPFLAGS)" \
9292
CXXFLAGS="$(CHIP_CXXFLAGS)" \

config/esp32/components/chip/component.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ DoubleQuoteStr = $(QuoteChar)$(subst $(QuoteChar),\$(QuoteChar),$(subst \,\\,$(1
8383
# ESP-IDF's project.mk fails to define RANLIB appropriately, so we define it here.
8484
RANLIB := $(call dequote,$(CONFIG_TOOLPREFIX))ranlib
8585

86-
CONFIGURE_OPTIONS := AR="$(AR)" CC="$(CC)" CXX="$(CXX)" LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" \
86+
CONFIGURE_OPTIONS := -C AR="$(AR)" CC="$(CC)" CXX="$(CXX)" LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" \
8787
INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
8888
CFLAGS=$(call DoubleQuoteStr, $(CFLAGS)) \
8989
CPPFLAGS=$(call DoubleQuoteStr, $(CPPFLAGS)) \

config/nrf5/nrf5-chip.mk

+1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ DoubleQuoteStr = $(QuoteChar)$(subst $(QuoteChar),\$(QuoteChar),$(subst \,\\,$(1
8686
# ==================================================
8787

8888
CHIP_CONFIGURE_OPTIONS = \
89+
-C \
8990
AR="$(AR)" AS="$(AS)" CC="$(CCACHE) $(CC)" CXX="$(CCACHE) $(CXX)" \
9091
LD="$(LD)" OBJCOPY="$(OBJCOPY)" RANLIB="$(RANLIB)" INSTALL="$(INSTALL) $(INSTALLFLAGS)" \
9192
CPPFLAGS=$(call DoubleQuoteStr, $(CHIP_CPPFLAGS)) \

docs/BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ be run again for the changes to be picked up.
9494
9595
mkdir build/<CONFIG>
9696
cd build/<CONFIG>
97-
../../configure <CONFIG ARGUMENTS>
97+
../../configure -C <CONFIG ARGUMENTS>
9898
```
9999

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

0 commit comments

Comments
 (0)