Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 574918
Collapse All | Expand All

(-)llvm-9999.orig/tools/llvm-config/CMakeLists.txt (-2 / +7 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 
# Just use CMAKE_CPP_FLAGS for CFLAGS and CXXFLAGS, otherwise compiler
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 
# TODO: figure out if we can remove -std=c++11 and move it to revdeps.
25 
set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
 29 
set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
26 
set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
 30 
set(LLVM_CXXFLAGS "${CMAKE_CPP_FLAGS} -std=c++11 ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
27 
set(LLVM_BUILD_SYSTEM cmake)
 31 
set(LLVM_BUILD_SYSTEM cmake)
28 
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
 32 
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
29 
set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
 33 
set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
Lines 31-37 Link Here
31 
# Use the C++ link flags, since they should be a superset of C link flags.
 35 
# Use the C++ link flags, since they should be a superset of C link flags.
32 
set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
 36 
set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
33 
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
 37 
set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
34 
set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
 38 
# We don't do static libs, so we don't need to supply any system-libs
39 
set(LLVM_SYSTEM_LIBS "")
35 
if(BUILD_SHARED_LIBS)
 40 
if(BUILD_SHARED_LIBS)
36 
  set(LLVM_ENABLE_SHARED ON)
 41 
  set(LLVM_ENABLE_SHARED ON)
37 
else()
 42 
else()
(-)llvm-9999.orig/tools/llvm-config/llvm-config.cpp (-4 / +13 lines)
Lines 532-541 Link Here
532 
        OS << LLVM_HAS_RTTI << '\n';
 532 
        OS << LLVM_HAS_RTTI << '\n';
533 
      } else if (Arg == "--shared-mode") {
 533 
      } else if (Arg == "--shared-mode") {
534 
        PrintSharedMode = true;
 534 
        PrintSharedMode = true;
535 
      } else if (Arg == "--obj-root") {
 535 
      } else if (Arg == "--obj-root" || Arg == "--src-root") {
536 
        OS << ActivePrefix << '\n';
 536 
        if (IsInDevelopmentTree) {
537 
      } else if (Arg == "--src-root") {
 537 
          if (Arg == "--obj-root") {
538 
        OS << LLVM_SRC_ROOT << '\n';
 538 
            OS << ActivePrefix << '\n';
539 
          } else {
540 
            OS << LLVM_SRC_ROOT << '\n';
541 
          }
542 
        } else {
543 
          // sources are not installed
544 
          llvm::errs() << "llvm-config: sources not installed, "
545 
                       << Arg << " not available\n";
546 
          exit(1);
547 
        }
539 
      } else if (Arg == "--link-shared") {
 548 
      } else if (Arg == "--link-shared") {
540 
        LinkMode = LinkModeShared;
 549 
        LinkMode = LinkModeShared;
541 
      } else if (Arg == "--link-static") {
 550 
      } else if (Arg == "--link-static") {
(-)llvm-9999.orig/utils/llvm-build/llvmbuild/main.py (-1 / +3 lines)
Lines 393-398 Link Here
393 
//
 393 
//
394 
//===----------------------------------------------------------------------===//
 394 
//===----------------------------------------------------------------------===//
395 

          395
          

        

            

              
              
              396
              
#include "llvm/Config/config.h"

            

            

              397
              

            

        

          396
          
""")

          398
          
""")

        

        

          397
          
        f.write('struct AvailableComponent {\n')

          399
          
        f.write('struct AvailableComponent {\n')

        

        

          398
          
        f.write('  /// The name of the component.\n')

          400
          
        f.write('  /// The name of the component.\n')

        

  

    
      
            Lines 413-419
          
      
      
        Link Here
      
    
  

        

          413
          
            if library_name is None:

          415
          
            if library_name is None:

        

        

          414
          
                library_name_as_cstr = 'nullptr'

          416
          
                library_name_as_cstr = 'nullptr'

        

        

          415
          
            else:

          417
          
            else:

        

          
            

              416
              
                library_name_as_cstr = '"%s"' % library_name


              418
              
                library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name

            

        

          417
          
            if is_installed:

          419
          
            if is_installed:

        

        

          418
          
                is_installed_as_cstr = 'true'

          420
          
                is_installed_as_cstr = 'true'

        

        

          419
          
            else:

          421
          
            else:

        






  

  Return to bug 574918