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
e1f01c9b
Commit
e1f01c9b
authored
Jul 28, 2011
by
Pieter Noordhuis
Browse files
Fix link order for ld --as-needed (thanks to Nigel Babu)
parent
c1b27012
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Makefile
View file @
e1f01c9b
...
...
@@ -32,7 +32,7 @@ ifeq ($(USE_TCMALLOC),yes)
CCLINK
+=
-ltcmalloc
CFLAGS
+=
-DUSE_TCMALLOC
endif
CCOPT
=
$(CFLAGS)
$(CCLINK)
$(ARCH)
$(PROF)
CCOPT
=
$(CFLAGS)
$(ARCH)
$(PROF)
PREFIX
=
/usr/local
INSTALL_BIN
=
$(PREFIX)
/bin
...
...
@@ -130,12 +130,12 @@ dependencies:
cd
../deps/linenoise
&&
$(MAKE)
ARCH
=
"
$(ARCH)
"
redis-server
:
$(OBJ)
$(QUIET_LINK)$(CC)
-o
$(PRGNAME)
$(CCOPT)
$(DEBUG)
$(OBJ)
$(QUIET_LINK)$(CC)
-o
$(PRGNAME)
$(CCOPT)
$(DEBUG)
$(OBJ)
$(CCLINK)
redis-benchmark
:
dependencies $(BENCHOBJ)
@
printf
'%b %b\n'
$(MAKECOLOR)
MAKE
$(ENDCOLOR)
$(BINCOLOR)
hiredis
$(ENDCOLOR)
cd
../deps/hiredis
&&
$(MAKE)
static
ARCH
=
"
$(ARCH)
"
$(QUIET_LINK)$(CC)
-o
$(BENCHPRGNAME)
$(CCOPT)
$(DEBUG)
$(BENCHOBJ)
../deps/hiredis/libhiredis.a
$(QUIET_LINK)$(CC)
-o
$(BENCHPRGNAME)
$(CCOPT)
$(DEBUG)
$(BENCHOBJ)
../deps/hiredis/libhiredis.a
$(CCLINK)
redis-benchmark.o
:
$(QUIET_CC)$(CC)
-c
$(CFLAGS)
-I
../deps/hiredis
$(DEBUG)
$(COMPILE_TIME)
$<
...
...
@@ -147,10 +147,10 @@ redis-cli.o:
$(QUIET_CC)$(CC)
-c
$(CFLAGS)
-I
../deps/hiredis
-I
../deps/linenoise
$(DEBUG)
$(COMPILE_TIME)
$<
redis-check-dump
:
$(CHECKDUMPOBJ)
$(QUIET_LINK)$(CC)
-o
$(CHECKDUMPPRGNAME)
$(CCOPT)
$(DEBUG)
$(CHECKDUMPOBJ)
$(QUIET_LINK)$(CC)
-o
$(CHECKDUMPPRGNAME)
$(CCOPT)
$(DEBUG)
$(CHECKDUMPOBJ)
$(CCLINK)
redis-check-aof
:
$(CHECKAOFOBJ)
$(QUIET_LINK)$(CC)
-o
$(CHECKAOFPRGNAME)
$(CCOPT)
$(DEBUG)
$(CHECKAOFOBJ)
$(QUIET_LINK)$(CC)
-o
$(CHECKAOFPRGNAME)
$(CCOPT)
$(DEBUG)
$(CHECKAOFOBJ)
$(CCLINK)
.c.o
:
$(QUIET_CC)$(CC)
-c
$(CFLAGS)
$(DEBUG)
$(COMPILE_TIME)
$<
...
...
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