diff options
| author | Andrew Wilkins <axwalk@gmail.com> | 2015-07-21 00:46:23 +0000 |
|---|---|---|
| committer | Andrew Wilkins <axwalk@gmail.com> | 2015-07-21 00:46:23 +0000 |
| commit | 6c1bfa93f50ecac369ac0b892989e913642d5215 (patch) | |
| tree | ece3d23903c3abbdb705828321a182463e1db849 /llvm/cmake/modules | |
| parent | 077f3fe1a16f4781ca5f814e12ae97984cb5597b (diff) | |
| download | bcm5719-llvm-6c1bfa93f50ecac369ac0b892989e913642d5215.tar.gz bcm5719-llvm-6c1bfa93f50ecac369ac0b892989e913642d5215.zip | |
[cmake] pass GO_EXECUTABLE to llgo-go
Summary:
When calling llgo-go from the llvm_add_go_executable
cmake function, specify $GO_EXECUTABLE as the go
command to call. Without this, llgo-go searches $PATH
which may be inconsistent with $GO_EXECUTABLE.
Reviewers: pcc
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D11290
llvm-svn: 242749
Diffstat (limited to 'llvm/cmake/modules')
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 9e108512fd8..b03057ff65c 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -825,7 +825,7 @@ function(llvm_add_go_executable binary pkgpath) endforeach(d) set(ldflags "${CMAKE_EXE_LINKER_FLAGS}") add_custom_command(OUTPUT ${binpath} - COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" + COMMAND ${CMAKE_BINARY_DIR}/bin/llvm-go "go=${GO_EXECUTABLE}" "cc=${cc}" "cxx=${cxx}" "cppflags=${cppflags}" "ldflags=${ldflags}" ${ARG_GOFLAGS} build -o ${binpath} ${pkgpath} DEPENDS llvm-config ${CMAKE_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX} ${llvmlibs} ${ARG_DEPENDS} |
