Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
abc60433
Unverified
Commit
abc60433
authored
Jan 05, 2018
by
Jan-Erik Rediger
Committed by
GitHub
Jan 05, 2018
Browse files
Merge pull request #564 from dmvo/master
Remove $(ARCH) expansion from the Makefile
parents
07d41473
12a9d1a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
abc60433
...
@@ -36,13 +36,13 @@ endef
...
@@ -36,13 +36,13 @@ endef
export
REDIS_TEST_CONFIG
export
REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH.
# Fallback to gcc when $CC is not in $PATH.
CC
:=
$(
shell
sh
-c
'type
$
(CC)
>/dev/null 2>/dev/null && echo
$(CC)
|| echo gcc'
)
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++'
)
CXX
:=
$(
shell
sh
-c
'type $
${
CXX
%% *
}
>/dev/null 2>/dev/null && echo
$(CXX)
|| echo g++'
)
OPTIMIZATION
?=
-O3
OPTIMIZATION
?=
-O3
WARNINGS
=
-Wall
-W
-Wstrict-prototypes
-Wwrite-strings
WARNINGS
=
-Wall
-W
-Wstrict-prototypes
-Wwrite-strings
DEBUG_FLAGS
?=
-g
-ggdb
DEBUG_FLAGS
?=
-g
-ggdb
REAL_CFLAGS
=
$(OPTIMIZATION)
-fPIC
$(CFLAGS)
$(WARNINGS)
$(DEBUG_FLAGS)
$(ARCH)
REAL_CFLAGS
=
$(OPTIMIZATION)
-fPIC
$(CFLAGS)
$(WARNINGS)
$(DEBUG_FLAGS)
REAL_LDFLAGS
=
$(LDFLAGS)
$(ARCH)
REAL_LDFLAGS
=
$(LDFLAGS)
DYLIBSUFFIX
=
so
DYLIBSUFFIX
=
so
STLIBSUFFIX
=
a
STLIBSUFFIX
=
a
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment