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 | |
| 14 | diff --git a/Makefile b/Makefile |
| 15 | index 8b0f0c2..66a4317 100644 |
| 16 | --- a/Makefile |
| 17 | +++ b/Makefile |
| 18 | @@ -34,11 +34,6 @@ define REDIS_TEST_CONFIG |
| 19 | endef |
| 20 | export REDIS_TEST_CONFIG |
| 21 | |
| 22 | -# Fallback to gcc when $CC is not in $PATH. |
| 23 | -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') |
| 24 | -OPTIMIZATION?=-O3 |
| 25 | -WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings |
| 26 | -DEBUG?= -g -ggdb |
| 27 | REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH) |
| 28 | REAL_LDFLAGS=$(LDFLAGS) $(ARCH) |
| 29 | |
| 30 | -- |
| 31 | 1.9.1 |
| 32 | |