Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001 |
| 2 | From: Venture Research <tech@ventureresearch.com> |
| 3 | Date: Fri, 8 Feb 2013 17:39:52 -0600 |
| 4 | Subject: [PATCH] hiredis: use default CC if it is set |
| 5 | |
| 6 | Instead of trying to automagically figure out CC, which breaks with OE |
| 7 | as CC has spaces in it, just skip it if one was already passed in. |
| 8 | |
| 9 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
| 10 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 11 | Update to work with 4.0.8 |
| 12 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 13 | |
| 14 | --- |
| 15 | deps/hiredis/Makefile | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile |
| 19 | index 9a4de836..271c06ba 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 20 | --- a/deps/hiredis/Makefile |
| 21 | +++ b/deps/hiredis/Makefile |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | @@ -36,7 +36,7 @@ endef |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 23 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 28 | CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 29 | OPTIMIZATION?=-O3 |
| 30 | WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings |