6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-24 06:25:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix llvm-config to emit the linker flag for the combined shared object built by autoconfig/make instead of the individual components.

Browse Source 
Summary:
When LLVM is configured to build shared libraries, CMake builds each component as it's own shared object, while autoconfig/make builds them statically and then links them all together to create a single shared object. This change adds compile time config flags to `llvm-config` so it can know whether LLVM's components are separated or not and act accordingly.

This fixes `llvm-config` instead of fixing the makefiles to behave like CMake because, AIUI, LLVM's autoconfig/make build system is on the way out anyway.

This change only affects `llvm-config` from builds that use autoconfig/make.

Reviewers: jfb

Subscribers: echristo, dschuff, llvm-commits

Differential Revision: http://reviews.llvm.org/D11392

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@243297 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
JF Bastien
2015-07-27 18:26:30 +00:00
parent dbd8d4f056
commit 6a829ed9d4
5 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tools/llvm-config/llvm-config.cpp
View File

@@ -349,6 +349,30 @@ int main(int argc, char **argv) {
/*IncludeNonInstalled=*/IsInDevelopmentTree);
if (PrintLibs || PrintLibNames || PrintLibFiles) {
// If LLVM was built as a shared library, there will be only one thing
// that users should link against.
const bool IsSharedLib = (std::strcmp(BUILD_SHARED_LIBS, "ON") == 0);
const bool WasBuiltWithCMake = (std::strcmp(WAS_BUILT_WITH_CMAKE, "ON") == 0);
// CMake correctly builds components as separate shared libraries, however
// autoconfig/make builds components a static libraries and then links
// them all together to form a single shared library. Thus, only when
// `WAS_BUILT_WITH_CMAKE` is `OFF` and `BUILD_SHARED_LIBS` is `ON` do we
// override `RequiredLibs` with the single library name.
if (IsSharedLib && !WasBuiltWithCMake) {
RequiredLibs.clear();
std::string Name = "libLLVM-" PACKAGE_VERSION;
const Triple HostTriple(LLVM_DEFAULT_TARGET_TRIPLE);
if (HostTriple.isOSWindows()) {
Name += ".dll";
} else if (HostTriple.isOSDarwin()) {
Name += ".dylib";
} else {
// default to linux' ext:
Name += ".so";
}
RequiredLibs.push_back(Name);
}
for (unsigned i = 0, e = RequiredLibs.size(); i != e; ++i) {
StringRef Lib = RequiredLibs[i];
if (i)
@@ -360,8 +384,23 @@ int main(int argc, char **argv) {
OS << ActiveLibDir << '/' << Lib;
} else if (PrintLibs) {
// If this is a typical library name, include it using -l.
if (Lib.startswith("lib") && Lib.endswith(".a")) {
OS << "-l" << Lib.slice(3, Lib.size()-2);
if (Lib.startswith("lib")) {
size_t FromEnd = 0;
if (Lib.endswith(".a")) {
FromEnd = 2;
} else if (Lib.endswith(".so")) {
FromEnd = 3;
} else if (Lib.endswith(".dylib")) {
FromEnd = 6;
} else {
FromEnd = 0;
}
if (FromEnd != 0) {
OS << "-l" << Lib.slice(3, Lib.size() - FromEnd);
} else {
OS << "-l:" << Lib;
}
continue;
}