You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2014/11/30 06:09:13 UTC
[16/20] lucy-clownfish git commit: Remove unnecessary hostSrcDir from
build.go.
Remove unnecessary hostSrcDir from build.go.
This commit will be consolidated away before merging to master.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/80154f6b
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/80154f6b
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/80154f6b
Branch: refs/heads/go_bindings_2
Commit: 80154f6b853ec3e7c5cb3b10e7acaee603e8fdce
Parents: e7c9382
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sat Nov 29 21:04:53 2014 -0800
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sat Nov 29 21:07:53 2014 -0800
----------------------------------------------------------------------
runtime/go/build.go | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/80154f6b/runtime/go/build.go
----------------------------------------------------------------------
diff --git a/runtime/go/build.go b/runtime/go/build.go
index 8f19e4d..a82cc36 100644
--- a/runtime/go/build.go
+++ b/runtime/go/build.go
@@ -37,7 +37,6 @@ var charmonizerC string = "../common/charmonizer.c"
var charmonizerEXE string = "charmonizer"
var charmonyH string = "charmony.h"
var buildDir string
-var hostSrcDir string
var buildGO string
var configGO string
var installedLibPath string
@@ -45,7 +44,6 @@ var installedLibPath string
func init() {
_, buildGO, _, _ = runtime.Caller(1)
buildDir = path.Dir(buildGO)
- hostSrcDir = path.Join(buildDir, "ext")
configGO = path.Join(buildDir, "clownfish", "config.go")
var err error
installedLibPath, err = cfc.InstalledLibPath(packageName)
@@ -111,8 +109,7 @@ func configure() {
}
if !current(charmonizerEXE, charmonyH) {
runCommand("./charmonizer", "--cc=cc", "--enable-c", "--host=go",
- "--host-src=" + hostSrcDir, "--enable-makefile",
- "--", "-std=gnu99", "-O2")
+ "--enable-makefile", "--", "-std=gnu99", "-O2")
}
}