tools/llvm-config: improve shared library support

[oota-llvm.git] / tools / llvm-go / llvm-go.go

diff --git a/tools/llvm-go/llvm-go.go b/tools/llvm-go/llvm-go.go
index ed79ca67b89d3743e1fbc4a18986b7f2c3722071..d0f794177bbf8aad75e5a2378e10bf33874aa3d2 100644 (file)
--- a/tools/llvm-go/llvm-go.go
+++ b/tools/llvm-go/llvm-go.go
@@ -88,17 +88,8 @@ func llvmConfig(args ...string) string {
        return outstr
 }
 
-func llvmFlags(linkmode string) compilerFlags {
-       ldflags := llvmConfig("--ldflags")
-       switch linkmode {
-       case linkmodeComponentLibs:
-               ldflags += " " + llvmConfig(append([]string{"--libs"}, components...)...)
-       case linkmodeDylib:
-               ldflags += " -lLLVM"
-       default:
-               panic("invalid linkmode: " + linkmode)
-       }
-       ldflags += " " + llvmConfig("--system-libs")
+func llvmFlags() compilerFlags {
+       ldflags := llvmConfig("--ldflags", "--libs", "--system-libs")
        if runtime.GOOS != "darwin" {
                // OS X doesn't like -rpath with cgo. See:
                // https://code.google.com/p/go/issues/detail?id=7293
@@ -133,8 +124,8 @@ func printComponents() {
        fmt.Println(strings.Join(components, " "))
 }
 
-func printConfig(linkmode string) {
-       flags := llvmFlags(linkmode)
+func printConfig() {
+       flags := llvmFlags()
 
        fmt.Printf(`// +build !byollvm
 
@@ -153,7 +144,7 @@ type (run_build_sh int)
 `, flags.cpp, flags.cxx, flags.ld)
 }
 
-func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode string) {
+func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags string) {
        args = addTag(args, "byollvm")
 
        srcdir := llvmConfig("--src-root")
@@ -182,7 +173,7 @@ func runGoWithLLVMEnv(args []string, cc, cxx, gocmd, llgo, cppflags, cxxflags, l
        newgopathlist = append(newgopathlist, filepath.SplitList(os.Getenv("GOPATH"))...)
        newgopath := strings.Join(newgopathlist, string(filepath.ListSeparator))
 
-       flags := llvmFlags(linkmode)
+       flags := llvmFlags()
 
        newenv := []string{
                "CC=" + cc,
@@ -250,7 +241,6 @@ func main() {
        ldflags := os.Getenv("CGO_LDFLAGS")
        gocmd := "go"
        llgo := ""
-       linkmode := linkmodeComponentLibs
 
        flags := []struct {
                name string
@@ -262,7 +252,6 @@ func main() {
                {"llgo", &llgo},
                {"cppflags", &cppflags},
                {"ldflags", &ldflags},
-               {"linkmode", &linkmode},
        }
 
        args := os.Args[1:]
@@ -283,11 +272,11 @@ LOOP:
 
        switch args[0] {
        case "build", "get", "install", "run", "test":
-               runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags, linkmode)
+               runGoWithLLVMEnv(args, cc, cxx, gocmd, llgo, cppflags, cxxflags, ldflags)
        case "print-components":
                printComponents()
        case "print-config":
-               printConfig(linkmode)
+               printConfig()
        default:
                usage()
        }