Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 1 | From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 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 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Instead of trying to automagically figure out CC, which breaks with OE |
| 10 | as CC has spaces in it, just skip it if one was already passed in. |
| 11 | |
| 12 | Signed-off-by: Venture Research <tech@ventureresearch.com> |
| 13 | |
| 14 | Update to work with 4.0.8 |
| 15 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> |
| 16 | |
| 17 | Reworked for 6.0.4 |
| 18 | Signed-off-by: Andreas MΓΌller <schnitzeltony@gmail.com> |
| 19 | |
| 20 | --- |
Andrew Geissler | 220dafd | 2023-10-04 10:18:08 -0500 | [diff] [blame] | 21 | Upstream-Status: Pending |
| 22 | |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 23 | deps/hiredis/Makefile | 2 -- |
| 24 | 1 file changed, 2 deletions(-) |
| 25 | |
| 26 | diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 27 | index bd2106b..9ce768d 100644 |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 28 | --- a/deps/hiredis/Makefile |
| 29 | +++ b/deps/hiredis/Makefile |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 30 | @@ -36,8 +36,6 @@ endef |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 31 | export REDIS_TEST_CONFIG |
| 32 | |
| 33 | # Fallback to gcc when $CC is not in $PATH. |
| 34 | -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') |
| 35 | -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') |
| 36 | OPTIMIZATION?=-O3 |
Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 37 | WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers |
Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 38 | DEBUG_FLAGS?= -g -ggdb |