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
b28d0461
Commit
b28d0461
authored
Nov 08, 2011
by
antirez
Browse files
32bit build fixed, broken by a previous commit fixing build on Solaris
parent
aa9a61cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
deps/lua/Makefile
View file @
b28d0461
...
...
@@ -53,7 +53,7 @@ R= 5.1.4
all
:
$(PLAT)
$(PLATS) clean
:
cd
src
&&
$(MAKE)
ARCH
=
"
$(ARCH)
"
$@
cd
src
&&
$(MAKE)
$@
test
:
dummy
src/lua
test
/hello.lua
...
...
deps/lua/src/Makefile
View file @
b28d0461
...
...
@@ -8,7 +8,7 @@
PLAT
=
none
CC
=
gcc
CFLAGS
=
-O2
-Wall
$(MYCFLAGS)
$(ARCH)
CFLAGS
=
-O2
-Wall
$(MYCFLAGS)
AR
=
ar rcu
RANLIB
=
ranlib
RM
=
rm
-f
...
...
@@ -52,10 +52,10 @@ $(LUA_A): $(CORE_O) $(LIB_O)
$(RANLIB)
$@
$(LUA_T)
:
$(LUA_O) $(LUA_A)
$(CC)
-o
$@
$(MYLDFLAGS)
$(LUA_O)
$(LUA_A)
$(LIBS)
$(ARCH)
$(CC)
-o
$@
$(MYLDFLAGS)
$(LUA_O)
$(LUA_A)
$(LIBS)
$(LUAC_T)
:
$(LUAC_O) $(LUA_A)
$(CC)
-o
$@
$(MYLDFLAGS)
$(LUAC_O)
$(LUA_A)
$(LIBS)
$(ARCH)
$(CC)
-o
$@
$(MYLDFLAGS)
$(LUAC_O)
$(LUA_A)
$(LIBS)
clean
:
$(RM)
$(ALL_T)
$(ALL_O)
...
...
@@ -84,7 +84,7 @@ aix:
$(MAKE)
all
CC
=
"xlc"
CFLAGS
=
"-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN"
MYLIBS
=
"-ldl"
MYLDFLAGS
=
"-brtl -bexpall"
ansi
:
$(MAKE)
all
MYCFLAGS
=
-DLUA_ANSI
ARCH
=
"
$(ARCH)
"
$(MAKE)
all
MYCFLAGS
=
-DLUA_ANSI
bsd
:
$(MAKE)
all
MYCFLAGS
=
"-DLUA_USE_POSIX -DLUA_USE_DLOPEN"
MYLIBS
=
"-Wl,-E"
...
...
src/Makefile
View file @
b28d0461
...
...
@@ -46,6 +46,7 @@ endif
CCLINK
+=
$(ALLOC_LINK)
CFLAGS
+=
$(ALLOC_FLAGS)
LUA_CFLAGS
+=
$(ARCH)
CCOPT
=
$(CFLAGS)
$(ARCH)
$(PROF)
...
...
@@ -167,7 +168,7 @@ dependencies:
@
printf
'%b %b\n'
$(MAKECOLOR)
MAKE
$(ENDCOLOR)
$(BINCOLOR)
linenoise
$(ENDCOLOR)
@
cd
../deps/linenoise
&&
$(MAKE)
ARCH
=
"
$(ARCH)
"
@
echo
$(MAKECOLOR)
MAKE
$(ENDCOLOR)
$(BINCOLOR)
Lua ansi
$(ENDCOLOR)
@
cd
../deps/lua
&&
$(MAKE)
ARCH
=
"
$(ARCH)
"
CFLAGS
=
"
$(LUA_CFLAGS)
"
ansi
@
cd
../deps/lua
&&
$(MAKE)
CFLAGS
=
"
$(LUA_CFLAGS)
"
MYLDFLAGS
=
"
$(ARCH)
"
ansi
../deps/jemalloc/lib/libjemalloc.a
:
cd
../deps/jemalloc
&&
./configure
$(JEMALLOC_CFLAGS)
--with-jemalloc-prefix
=
je_
--enable-cc-silence
&&
$(MAKE)
lib/libjemalloc.a
...
...
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