mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-11-01 15:11:24 +00:00
Teach lit to filter the host LDFLAGS down from the build system and into
the CGO build environment. This lets things like -rpath propagate down to the C++ code that is built along side the Go bindings when testing them. Patch by Peter Collingbourne, and verified that it works by me. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220252 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
82805eb232
commit
14e55b16df
@ -657,6 +657,7 @@ function(configure_lit_site_cfg input output)
|
||||
|
||||
set(HOST_CC "${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}")
|
||||
set(HOST_CXX "${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}")
|
||||
set(HOST_LDFLAGS "${CMAKE_EXE_LINKER_FLAGS}")
|
||||
|
||||
configure_file(${input} ${output} @ONLY)
|
||||
endfunction()
|
||||
|
@ -2,7 +2,7 @@
|
||||
; RUN: env CGO_CPPFLAGS="$(llvm-config --cppflags)" \
|
||||
; RUN: CGO_CXXFLAGS=-std=c++11 \
|
||||
; RUN: CGO_LDFLAGS="$(llvm-config --ldflags --libs --system-libs \
|
||||
; RUN: $(../build.sh --print-components))" \
|
||||
; RUN: $(../build.sh --print-components)) $CGO_LDFLAGS" \
|
||||
; RUN: %go test -tags byollvm .
|
||||
|
||||
; REQUIRES: shell
|
||||
|
@ -54,3 +54,4 @@ def fixup_compiler_path(compiler):
|
||||
|
||||
config.environment['CC'] = fixup_compiler_path(config.host_cc)
|
||||
config.environment['CXX'] = fixup_compiler_path(config.host_cxx)
|
||||
config.environment['CGO_LDFLAGS'] = config.host_ldflags
|
||||
|
@ -136,6 +136,7 @@ lit.site.cfg: FORCE
|
||||
@$(ECHOPATH) s=@GO_EXECUTABLE@=$(GO)=g >> lit.tmp
|
||||
@$(ECHOPATH) s!@HOST_CC@!$(CC)!g >> lit.tmp
|
||||
@$(ECHOPATH) s!@HOST_CXX@!$(CXX)!g >> lit.tmp
|
||||
@$(ECHOPATH) s!@HOST_LDFLAGS@!$(LDFLAGS)!g >> lit.tmp
|
||||
@$(ECHOPATH) s=@ENABLE_SHARED@=$(ENABLE_SHARED)=g >> lit.tmp
|
||||
@$(ECHOPATH) s=@ENABLE_ASSERTIONS@=$(ENABLE_ASSERTIONS)=g >> lit.tmp
|
||||
@$(ECHOPATH) s=@TARGETS_TO_BUILD@=$(TARGETS_TO_BUILD)=g >> lit.tmp
|
||||
|
@ -22,6 +22,7 @@ config.host_os = "@HOST_OS@"
|
||||
config.host_arch = "@HOST_ARCH@"
|
||||
config.host_cc = "@HOST_CC@"
|
||||
config.host_cxx = "@HOST_CXX@"
|
||||
config.host_ldflags = "@HOST_LDFLAGS@"
|
||||
config.llvm_use_intel_jitevents = "@LLVM_USE_INTEL_JITEVENTS@"
|
||||
config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
|
||||
config.have_zlib = "@HAVE_LIBZ@"
|
||||
|
Loading…
Reference in New Issue
Block a user