Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 374 #806

Closed
wants to merge 2 commits into from
Closed

Issue 374 #806

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16fa3a8
Issue #374: Resolve compilation errors when using clang. Test for Cla…
jetslambda Dec 2, 2012
7d49930
Fix inadvertent use of -lpthread linking option.
jetslambda Dec 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/Makefile
View file
Open in desktop
Expand Up @@ -45,16 +45,23 @@ endif
# Override default settings if possible # Override default settings if possible
-include .make-settings -include .make-settings


# Test for Clang and remove linking option(s).
ifneq (,$(findstring clang, $(shell $(CC) --version)))
LDFLAG_DYN=
else
LDFLAG_DYN = -rdynamic
endif

ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6 FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread FINAL_LIBS= -ldl -lnsl -lsocket -lm -pthread
DEBUG= -g -ggdb DEBUG= -g -ggdb
else else
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g $(LDFLAG_DYN) -ggdb
FINAL_LIBS= -lm -pthread FINAL_LIBS= -lm -lpthread
DEBUG= -g -rdynamic -ggdb DEBUG= -g $(LDFLAG_DYN) -ggdb
endif endif


# Include paths to dependencies # Include paths to dependencies
Expand Down