From da95bf34aeacb09fb08fcc6bade6d9e48d32093a Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Sat, 19 Feb 2011 12:19:07 -0800 Subject: Fix building of Lua extension on OS X. --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Makefile') 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 -- cgit v1.2.3