Commit e5088380 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

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'.

Reported-by: default avatarJohan Sagaert <sagaert.johan@skynet.be>
Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 027ef3f2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ diff -ur old/src/Makefile new/src/Makefile
 	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