This is an archive of the discontinued LLVM Phabricator instance.

llvm-go: call llvm-config with components
ClosedPublic

Authored by axw on Jan 20 2016, 6:34 PM.

Reviewers

pcc

Commits

Summary

Add components back into calls to llvm-config,
which was accidentally removed in r258283.

axw retitled this revision from to llvm-go: call llvm-config with components.

axw updated this object.

axw added a reviewer: pcc.

axw added a subscriber: llvm-commits.

LGTM

This revision is now accepted and ready to land.Jan 20 2016, 6:35 PM

Path

Size

tools/

llvm-go/

3 lines

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines	func llvmConfig(args ...string) string {

outstr := string(out)		outstr := string(out)
outstr = strings.TrimSuffix(outstr, "\n")		outstr = strings.TrimSuffix(outstr, "\n")
outstr = strings.Replace(outstr, "\n", " ", -1)		outstr = strings.Replace(outstr, "\n", " ", -1)
return outstr		return outstr
}		}

func llvmFlags() compilerFlags {		func llvmFlags() compilerFlags {
ldflags := llvmConfig("--ldflags", "--libs", "--system-libs")		args := append([]string{"--ldflags", "--libs", "--system-libs"}, components...)
		ldflags := llvmConfig(args...)
if runtime.GOOS != "darwin" {		if runtime.GOOS != "darwin" {
// OS X doesn't like -rpath with cgo. See:		// OS X doesn't like -rpath with cgo. See:
// https://code.google.com/p/go/issues/detail?id=7293		// https://code.google.com/p/go/issues/detail?id=7293
ldflags = "-Wl,-rpath," + llvmConfig("--libdir") + " " + ldflags		ldflags = "-Wl,-rpath," + llvmConfig("--libdir") + " " + ldflags
}		}
return compilerFlags{		return compilerFlags{
cpp: llvmConfig("--cppflags"),		cpp: llvmConfig("--cppflags"),
cxx: "-std=c++11",		cxx: "-std=c++11",
▲ Show 20 Lines • Show All 183 Lines • Show Last 20 Lines