[llvm-go] parameterize $GOPATH construction
Summary:
To build llgo, you must currently ensure that llgo
is in the tools/llgo directory, due to a hard-coded
path in llvm-go.
To support the use of LLVM_EXTERNAL_LLGO_SOURCE_DIR,
we introduce a flag to llvm-go that enables the
caller to specify the paths to symlink in the
temporary $GOPATH.
Reviewers: pcc
Subscribers: llvm-commits
Differential Revision: https://reviews.llvm.org/D21634
llvm-svn: 276829
diff --git a/llvm/tools/llvm-go/llvm-go.go b/llvm/tools/llvm-go/llvm-go.go
index 12f0d73..604509f 100644
--- a/llvm/tools/llvm-go/llvm-go.go
+++ b/llvm/tools/llvm-go/llvm-go.go
@@ -35,7 +35,6 @@
var packages = []pkg{
{"bindings/go/llvm", "llvm.org/llvm/bindings/go/llvm"},
- {"tools/llgo", "llvm.org/llgo"},
}
type compilerFlags struct {
@@ -145,7 +144,7 @@
`, flags.cpp, flags.cxx, flags.ld)
}
-func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string) {
+func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string, packages []pkg) {
args = addTag(args, "byollvm")
srcdir := llvmConfig("--src-root")
@@ -162,7 +161,12 @@
panic(err.Error())
}
- err = os.Symlink(filepath.Join(srcdir, p.llvmpath), path)
+ abspath := p.llvmpath
+ if !filepath.IsAbs(abspath) {
+ abspath = filepath.Join(srcdir, abspath)
+ }
+
+ err = os.Symlink(abspath, path)
if err != nil {
panic(err.Error())
}
@@ -242,6 +246,7 @@
ldflags := os.Getenv("CGO_LDFLAGS")
gocmd := "go"
llgo := ""
+ packagesString := ""
flags := []struct {
name string
@@ -253,6 +258,7 @@
{"llgo", &llgo},
{"cppflags", &cppflags},
{"ldflags", &ldflags},
+ {"packages", &packagesString},
}
args := os.Args[1:]
@@ -271,9 +277,24 @@
break
}
+ packages := packages
+ if packagesString != "" {
+ for _, field := range strings.Fields(packagesString) {
+ pos := strings.IndexRune(field, '=')
+ if pos == -1 {
+ fmt.Fprintf(os.Stderr, "invalid packages value %q, expected 'pkgpath=llvmpath [pkgpath=llvmpath ...]'\n", packagesString)
+ os.Exit(1)
+ }
+ packages = append(packages, pkg{
+ pkgpath: field[:pos],
+ llvmpath: field[pos+1:],
+ })
+ }
+ }
+
switch args[0] {
case "build", "get", "install", "run", "test":
- runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags)
+ runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, packages)
case "print-components":
printComponents()
case "print-config":