golua lib build cmds steal flags from CGO's gcc flags

which maybe will make it work...
afitz · Jul 29, 2010 · acca3cb · acca3cb
1 parent 0c517ba
commit acca3cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lua51/Makefile b/lua51/Makefile
@@ -17,6 +17,7 @@ endif
 
 ifndef LUA51_INCLUDE_DIR
 CGO_CFLAGS+=`pkg-config --cflags $(LUA51_LIBNAME)`
+LUA51_INCLUDE_DIR:=$(shell pkg-config --cflags-only-I $(LUA51_LIBNAME) | sed 's/-I//' | sed 's/[ 	]*$$//')
 else
 CGO_CFLAGS+=-I$(LUA51_INCLUDE_DIR)
 endif
@@ -39,7 +40,8 @@ GOFILES=lua_defs.go
 
 CLEANFILES+=lua_defs.go
 
-LUA_HEADER_FILES=/usr/include/lua5.1/lua.h /usr/include/lua5.1/lauxlib.h /usr/include/lua5.1/lualib.h
+LUA_HEADERS=lua.h lauxlib.h lualib.h
+LUA_HEADER_FILES:=$(patsubst %,$(LUA51_INCLUDE_DIR)/%,$(LUA_HEADERS))
 
 include $(GOROOT)/src/Make.pkg
 
@@ -51,7 +53,7 @@ libgolua.a: golua.o
 	ar rcs libgolua.a golua.o
 
 golua.o: golua.c
-	gcc -I/usr/include/lua5.1 -c golua.c -o golua.o
+	gcc $(CGO_CFLAGS) $(_CGO_CFLAGS_$(GOARCH)) -c golua.c -o golua.o
 
 lua_defs.go:
 	echo "package lua51;" > lua_defs.go

diff --git a/lua51/lua.go b/lua51/lua.go
@@ -428,7 +428,8 @@ func ToGoFunction(L *State, index int) (f GoFunction) {
 
 func ToString(L *State, index int) string {
 	var size C.size_t;
-	return C.GoString(C.lua_tolstring(L.s, C.int(index), &size));
+	//C.GoString(C.lua_tolstring(L.s, C.int(index), &size));
+	return C.GoString(C.lua_tolstring(L.s,C.int(index),&size));
 }
 
 func ToInteger(L *State, index int) int {