Permalink
Browse files

Statically link Lua

  • Loading branch information...
1 parent 567fe8c commit 8c1b056720c5dc229ae3fbc5a25ee31819ff83e5 @trink trink committed Apr 30, 2013
Showing with 4 additions and 5 deletions.
  1. +0 −1 CMakeLists.txt
  2. +4 −4 Makefile
View
@@ -17,4 +17,3 @@ if(CMAKE_HOST_UNIX)
endif(CMAKE_HOST_UNIX)
include_directories(${CMAKE_BINARY_DIR}/external/include)
-add_subdirectory(src/github.com/mozilla-services/heka/sandbox)
View
@@ -4,7 +4,7 @@ HERE = $(shell pwd)
BIN = $(HERE)/bin
GOBIN = $(HERE)/bin/go
HGBIN = $(HERE)/pythonVE/bin/hg
-GOCMD = LD_LIBRARY_PATH=${BIN} DYLD_LIBRARY_PATH=${BIN} GOPATH=$(HERE) $(GOBIN)
+GOCMD = GOPATH=$(HERE) $(GOBIN)
GOPATH = $GOPATH:$(HERE)
SANDBOX = $(HERE)/src/github.com/mozilla-services/heka/sandbox/lua/lua_sandbox.go
@@ -24,7 +24,7 @@ clean-src:
rm -rf src/*
clean-heka:
- rm -f bin/hekad bin/libsandbox.so
+ rm -f bin/hekad
clean-all: clean-go clean-src clean-heka
@@ -83,9 +83,9 @@ heka-source: src/github.com/mozilla-services/heka/README.md
bin/hekad: pluginloader heka-source $(HERE)/pythonVE $(GOBIN)
@GOPATH=$GOPATH python scripts/update_deps.py package_deps.txt
- @perl -pi.bak -e "s,HEKABUILDPATH,$(BIN),g" $(SANDBOX)
+ @perl -pi.bak -e "s,HEKABUILDPATH,$(HERE),g" $(SANDBOX)
@cd src && \
- $(GOCMD) install -ldflags="-r ./" github.com/mozilla-services/heka/cmd/hekad
+ $(GOCMD) install github.com/mozilla-services/heka/cmd/hekad
@mv $(SANDBOX).bak $(SANDBOX)
hekad: sandbox bin/hekad

0 comments on commit 8c1b056

Please sign in to comment.