blob: 421f306ded326fba3e093ba0a924917ccd1ef33b [file] [log] [blame]
Patrick Williamsb48b7b42016-08-17 15:04:38 -05001From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 17:39:52 -0600
4Subject: [PATCH] hiredis: use default CC if it is set
5
6Instead of trying to automagically figure out CC, which breaks with OE
7as CC has spaces in it, just skip it if one was already passed in.
8
9Signed-off-by: Venture Research <tech@ventureresearch.com>
10
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080011Update to work with 4.0.8
12Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -050013
14---
15 deps/hiredis/Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
19index 9a4de836..271c06ba 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020--- a/deps/hiredis/Makefile
21+++ b/deps/hiredis/Makefile
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022@@ -36,7 +36,7 @@ endef
Patrick Williamsb48b7b42016-08-17 15:04:38 -050023 export REDIS_TEST_CONFIG
24
25 # Fallback to gcc when $CC is not in $PATH.
26-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
27+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028 CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
Patrick Williamsb48b7b42016-08-17 15:04:38 -050029 OPTIMIZATION?=-O3
30 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings