diff options
| author | Jan-Erik Rediger <badboy@archlinux.us> | 2018-01-05 15:49:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-05 15:49:51 +0100 |
| commit | abc60433e6af7de67cf4e04276b575e61290d301 (patch) | |
| tree | ae2485e5c498479fb950ca2c10c6c4f52f38e068 | |
| parent | 07d414731b771844fba1c18303a2185948f9c0a9 (diff) | |
| parent | 12a9d1a32b567ad933ec62528ca4a476f514b5da (diff) | |
Merge pull request #564 from dmvo/master
Remove $(ARCH) expansion from the Makefile
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -36,13 +36,13 @@ endef export REDIS_TEST_CONFIG # Fallback to gcc when $CC is not in $PATH. -CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') -CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++') +CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') +CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') OPTIMIZATION?=-O3 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings DEBUG_FLAGS?= -g -ggdb -REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) -REAL_LDFLAGS=$(LDFLAGS) $(ARCH) +REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) +REAL_LDFLAGS=$(LDFLAGS) DYLIBSUFFIX=so STLIBSUFFIX=a |