Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 565358 | Differences between
and this patch

Collapse All | Expand All

(-)llvm-3.7.0.src/utils/llvm-build/llvmbuild/main.py~ (-1 / +1 lines)
Lines 413-419 Link Here
413 
            if library_name is None:
 413 
            if library_name is None:
414 
                library_name_as_cstr = '0'
 414 
                library_name_as_cstr = '0'
415 
            else:
 415 
            else:
416 
                library_name_as_cstr = '"lib%s.a"' % library_name
 416 
                library_name_as_cstr = '"lib%s.so"' % library_name
417 
            f.write('  { "%s", %s, %d, { %s } },\n' % (
 417 
            f.write('  { "%s", %s, %d, { %s } },\n' % (
418 
                name, library_name_as_cstr, is_installed,
 418 
                name, library_name_as_cstr, is_installed,
419 
                ', '.join('"%s"' % dep
 419 
                ', '.join('"%s"' % dep
(-)llvm-3.7.0.src/tools/llvm-config/CMakeLists.txt~ (-2 / +5 lines)
Lines 22-29 Link Here
22 
set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
 22 
set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
23 
set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
 23 
set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
24 
set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 24 
set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
25 
set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 25 
# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler
26 
set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
 26 
# specific flags will be set when we don't know what compiler will be used
27 
# with external project utilising llvm-config.  C++ Standard is required.
28 
set(LLVM_CFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
29 
set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
27 
# Use the C++ link flags, since they should be a superset of C link flags.
 30 
# Use the C++ link flags, since they should be a superset of C link flags.
28 
set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
 31 
set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
29 
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
 32 
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
(-)llvm-3.7.0.src/tools/llvm-config/llvm-config.cpp~ (-2 / +2 lines)
Lines 360-367 Link Here
360 
          OS << ActiveLibDir << '/' << Lib;
 360 
          OS << ActiveLibDir << '/' << Lib;
361 
        } else if (PrintLibs) {
 361 
        } else if (PrintLibs) {
362 
          // If this is a typical library name, include it using -l.
 362 
          // If this is a typical library name, include it using -l.
363 
          if (Lib.startswith("lib") && Lib.endswith(".a")) {
 363 
          if (Lib.startswith("lib") && Lib.endswith(".so")) {
364 
            OS << "-l" << Lib.slice(3, Lib.size()-2);
 364 
            OS << "-l" << Lib.slice(3, Lib.size()-3);
365 
            continue;
 365 
            continue;
366 
          }
 366 
          }
367 

          367
          

        






  

  Return to bug 565358