]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
projects / coffee / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 027ef3f)
redis: fix build with ccache enabled
authorThomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>
Wed, 28 Aug 2013 13:40:25 +0000 (15:40 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Wed, 28 Aug 2013 14:20:12 +0000 (16:20 +0200)
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: Johan Sagaert <sagaert.johan@skynet.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/redis/redis-001-uclibc.patch patch | blob | history

diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch
index 8762ca2fb91dca492b291fcd5474de41232e5179..01657d0ea8e9ffe1e370b662572d9334ffee99b2 100644 (file)
--- a/package/redis/redis-001-uclibc.patch
+++ b/package/redis/redis-001-uclibc.patch
@@ -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