| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From d13b918a3ff8b0ebfd1e7b18b198b4b45841d720 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrea Galbusera <gizero@gmail.com> |
| 3 | Date: Fri, 31 Jul 2015 16:42:08 +0200 |
| 4 | Subject: [PATCH] Makefile: remove hardcoding of CC |
| 5 | |
| 6 | * upgrade previous patch to avoid wiping CFLAGS. This fixes build on arm |
| 7 | platforms which previously caused and issue due to -fPIC being lost |
| 8 | |
| 9 | Signed-off-by: Andrea Galbusera <gizero@gmail.com> |
| 10 | --- |
| 11 | Makefile | 5 ----- |
| 12 | 1 file changed, 5 deletions(-) |
| 13 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 14 | --- a/Makefile |
| 15 | +++ b/Makefile |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 16 | @@ -35,12 +35,6 @@ define REDIS_TEST_CONFIG |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 17 | endef |
| 18 | export REDIS_TEST_CONFIG |
| 19 | |
| 20 | -# Fallback to gcc when $CC is not in $PATH. |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 21 | -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') |
| 22 | -CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | -OPTIMIZATION?=-O3 |
| 24 | -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 25 | -DEBUG_FLAGS?= -g -ggdb |
| 26 | REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) |
| 27 | REAL_LDFLAGS=$(LDFLAGS) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 28 | |