Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
82554cae
Commit
82554cae
authored
Jun 15, 2016
by
Salvatore Sanfilippo
Committed by
GitHub
Jun 15, 2016
Browse files
Merge pull request #3313 from zshipko/unstable
BSDs don't have -ldl
parents
41d804d9
b7b9aa6d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
82554cae
...
...
@@ -55,7 +55,7 @@ endif
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
-I
../deps/geohash-int
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
$(DEBUG)
FINAL_LIBS
=
-lm
-ldl
FINAL_LIBS
=
-lm
DEBUG
=
-g
-ggdb
ifeq
($(uname_S),SunOS)
...
...
@@ -65,17 +65,27 @@ ifeq ($(uname_S),SunOS)
FINAL_LIBS
+=
-ldl
-lnsl
-lsocket
-lresolv
-lpthread
-lrt
else
ifeq
($(uname_S),Darwin)
# Darwin (nothing to do)
# Darwin
FINAL_LIBS
+=
-ldl
else
ifeq
($(uname_S),AIX)
# AIX
FINAL_LDFLAGS
+=
-Wl
,-bexpall
FINAL_LIBS
+=
-pthread
-lcrypt
-lbsd
FINAL_LIBS
+=
-ldl
-pthread
-lcrypt
-lbsd
else
ifeq
($(uname_S),OpenBSD)
# OpenBSD
FINAL_LIBS
+=
-lpthread
else
ifeq
($(uname_S),FreeBSD)
# FreeBSD
FINAL_LIBS
+=
-lpthread
else
# All the other OSes (notably Linux)
FINAL_LDFLAGS
+=
-rdynamic
FINAL_LIBS
+=
-pthread
FINAL_LIBS
+=
-ldl
-pthread
endif
endif
endif
endif
endif
...
...
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