Skip to contentSkip to conversation

redis: fix build with ccache enabled

PATCH New Thomas De Schampheleire 2 participants 2 messages Aug 28, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 redis: fix build with ccache enabled

Some parts of redis fail to build when ccache is enabled, due to one of our own patches. The construct

    make CC=$(CC) target1 target2

would result in
make CC=ccache <tuple>-gcc target1 target2

and here <tuple>-gcc would be treated as a target and the compiler used would be just 'ccache'.

---
I think this should still be applied for 2013.08.

 package/redis/redis-001-uclibc.patch |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/redis/redis-001-uclibc.patch +1 -1
@@ -39,7 +39,7 @@ diff -ur old/src/Makefile new/src/Makefi
  	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
  	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
 -	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
-+	-(cd ../deps && $(MAKE) CC=$(CC) $(DEPENDENCY_TARGETS))
++	-(cd ../deps && $(MAKE) CC="$(CC)" $(DEPENDENCY_TARGETS))
  
  .PHONY: persist-settings
  
#1 lore raw

PATCH 1/1 redis: fix build with ccache enabled

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Thomas> Some parts of redis fail to build when ccache is enabled, due to one of our Thomas> own patches. The construct
Thomas> make CC=$(CC) target1 target2
Thomas> would result in
Thomas> make CC=ccache <tuple>-gcc target1 target2

Thomas> and here <tuple>-gcc would be treated as a target and the compiler used Thomas> would be just 'ccache'.

Thomas> Reported-by: Johan Sagaert <[email protected]>
Thomas> Signed-off-by: Thomas De Schampheleire <[email protected]>

Thomas> ---
Thomas> I think this should still be applied for 2013.08.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard