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

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

Browse Source 
This reverts commit 01446706b4.

Causes breakage, seems to be related to 'svn' in the file's name:

  CC=gcc CXX=g++ \
  ../llvm/configure \
    --prefix=/usr \
    --sysconfdir=/etc \
    --enable-shared \
    --enable-libffi \
    --enable-targets=all \
    --disable-assertions \
    --with-python=/usr/bin/python2 \
    --enable-optimized

  make REQUIRES_RTTI=1 ENABLE_PIC=1

results:
llvm[2]: Linking Release unit test Support (without symbols)
llvm[2]: ======= Finished Linking Release Unit test Support (without symbols)
make[3]: Entering directory '/build/llvm-svn/src/build/bindings/ocaml/llvm'
make[3]: *** No rule to make target '/build/llvm-
svn/src/build/Release/lib/ocaml/libLLVM-3.7.0svn.so', needed by 'build-
deplibs'.  Stop.
make[3]: *** Waiting for unfinished jobs....
llvm[3]: Compiling llvm_ocaml.c for Release build
make[3]: Leaving directory '/build/llvm-svn/src/build/bindings/ocaml/llvm'
/build/llvm-svn/src/llvm/Makefile.rules:880: recipe for target 'all' failed
/build/llvm-svn/src/llvm/Makefile.rules:965: recipe for target 'all' failed

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@242152 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
JF Bastien
2015-07-14 15:10:34 +00:00
parent c1abe6eb28
commit c20f89496e
4 changed files with 2 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,30 +349,6 @@ 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)
@@ -384,23 +360,8 @@ 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")) {
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;
}
if (Lib.startswith("lib") && Lib.endswith(".a")) {
OS << "-l" << Lib.slice(3, Lib.size()-2);
continue;
}