summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2011-02-19 12:19:07 -0800
committerJoshua Haberman <joshua@reverberate.org>2011-02-19 12:19:07 -0800
commitda95bf34aeacb09fb08fcc6bade6d9e48d32093a (patch)
treeb67ad00cd8db87602b4207cc97ba89eb82ac704e /Makefile
parent1e972d40f1d1d7833228c64a4c694a1777c99911 (diff)
Fix building of Lua extension on OS X.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3e11417..d9f8008 100644
--- a/Makefile
+++ b/Makefile
@@ -353,12 +353,11 @@ benchmarks/b.parsetostruct_googlemessage2.proto2_compiled: \
# Lua extension ##################################################################
+LUA_CPPFLAGS = $(strip $(shell pkg-config --silence-errors --cflags lua || pkg-config --silence-errors --cflags lua5.1 || echo '-I/usr/local/include'))
ifeq ($(shell uname), Darwin)
- LUA_CPPFLAGS = -I/usr/include/lua5.1
- LUA_LDFLAGS = -L/usr/local/lib -llua
+ LUA_LDFLAGS = -undefined dynamic_lookup
else
- LUA_CPPFLAGS = $(strip $(shell pkg-config --silence-errors --cflags lua || pkg-config --cflags lua5.1))
- LUA_LDFLAGS = $(strip $(shell pkg-config --silence-errors --libs lua || pkg-config --libs lua5.1))
+ LUA_LDFLAGS =
endif
LUAEXT=lang_ext/lua/upb.so
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback