diff options
author | Fangrui Song <maskray@google.com> | 2018-09-06 19:51:20 +0000 |
---|---|---|
committer | Fangrui Song <maskray@google.com> | 2018-09-06 19:51:20 +0000 |
commit | 95dd7a25bab98a93bd58c47e0b6d6f91791bf987 (patch) | |
tree | 4e23fba2baa8eee95c38a351563f6969fdac06c2 /llvm/lib/Testing/Support | |
parent | bf985258b9af0de0c95370c696fbdbc03d0713cf (diff) | |
download | bcm5719-llvm-95dd7a25bab98a93bd58c47e0b6d6f91791bf987.tar.gz bcm5719-llvm-95dd7a25bab98a93bd58c47e0b6d6f91791bf987.zip |
Quick fix for -DBUILD_SHARED_LIBS=on build after rL341502
libLLVMTestingSupport.so references a symbol in utils/unittest/UnitTestMain/TestMain.cpp (a layering issue) and will cause a link error because of -Wl,-z,defs (cmake/modules/HandleLLVMOptions.cmake)
Waiting zturner for a better fix.
llvm-svn: 341580
Diffstat (limited to 'llvm/lib/Testing/Support')
-rw-r--r-- | llvm/lib/Testing/Support/SupportHelpers.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Testing/Support/SupportHelpers.cpp b/llvm/lib/Testing/Support/SupportHelpers.cpp index c0f4f44e144..13ff07c2e13 100644 --- a/llvm/lib/Testing/Support/SupportHelpers.cpp +++ b/llvm/lib/Testing/Support/SupportHelpers.cpp @@ -13,10 +13,8 @@ using namespace llvm; using namespace llvm::unittest; -extern const char *TestMainArgv0; - -SmallString<128> llvm::unittest::getInputFileDirectory() { - llvm::SmallString<128> Result = llvm::sys::path::parent_path(TestMainArgv0); +SmallString<128> llvm::unittest::getInputFileDirectory(const char *Argv0) { + llvm::SmallString<128> Result = llvm::sys::path::parent_path(Argv0); llvm::sys::fs::make_absolute(Result); llvm::sys::path::append(Result, "llvm.srcdir.txt"); |