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
0c8690d4
Commit
0c8690d4
authored
Mar 16, 2013
by
Johan Bergström
Committed by
antirez
Apr 02, 2013
Browse files
Slightly refactor CFLAGS/LDFLAGS/LIBS
This way, we can avoid -rdynamic and -pthread warnings on darwin.
parent
cf8484b7
Changes
1
Show whitespace changes
Inline
Side-by-side
src/Makefile
View file @
0c8690d4
...
@@ -45,16 +45,20 @@ endif
...
@@ -45,16 +45,20 @@ endif
# Override default settings if possible
# Override default settings if possible
-include
.make-settings
-include
.make-settings
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
$(DEBUG)
FINAL_LIBS
=
-lm
DEBUG
=
-g
-ggdb
ifeq
($(uname_S),SunOS)
ifeq
($(uname_S),SunOS)
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
-D__EXTENSIONS__
-D_XPG6
FINAL_CFLAGS
+
=
-D__EXTENSIONS__
-D_XPG6
FINAL_L
DFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
-g
-ggdb
FINAL_L
IBS
+=
-ldl
-lnsl
-lsocket
-lpthread
FINAL_LIBS
=
-ldl
-lnsl
-lsocket
-lm
-lpthread
else
ifeq
($(uname_S),Darwin)
DEBUG
=
-g
-ggdb
else
else
FINAL_CFLAGS
=
$(STD)
$(WARN)
$(OPT)
$(DEBUG)
$(CFLAGS)
$(REDIS_CFLAGS)
FINAL_LDFLAGS
+=
-rdynamic
FINAL_LDFLAGS
=
$(LDFLAGS)
$(REDIS_LDFLAGS)
-g
-rdynamic
-ggdb
FINAL_LIBS
+=
-pthread
FINAL_LIBS
=
-lm
-pthread
DEBUG
+=
-rdynamic
DEBUG
=
-g
-rdynamic
-ggdb
endif
endif
# Include paths to dependencies
# Include paths to dependencies
...
...
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