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
redis
Commits
2bea502d
Unverified
Commit
2bea502d
authored
Mar 12, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 12, 2020
Browse files
Merge pull request #6975 from dustinmm80/add-arm-latomic-linking
Fix Pi building needing -latomic, 5.0 branch backport
parents
fd441300
b5931405
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
2bea502d
...
@@ -77,6 +77,15 @@ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
...
@@ -77,6 +77,15 @@ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS
=
-lm
FINAL_LIBS
=
-lm
DEBUG
=
-g
-ggdb
DEBUG
=
-g
-ggdb
# Linux ARM needs -latomic at linking time
ifneq
(,$(filter aarch64 armv,$(uname_M)))
FINAL_LIBS
+=
-latomic
else
ifneq
(,$(findstring armv,$(uname_M)))
FINAL_LIBS
+=
-latomic
endif
endif
ifeq
($(uname_S),SunOS)
ifeq
($(uname_S),SunOS)
# SunOS
# SunOS
ifneq
($(@@),32bit)
ifneq
($(@@),32bit)
...
...
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