This is an archive of the discontinued LLVM Phabricator instance.

Differential D47982

Fix when LLVM_USE_INTEL_JITEVENTS and LLVM_USE_OPROFILE not set, llvm-build not gen LibraryDependencies.inc
ClosedPublic

Authored by fcharlie on Jun 9 2018, 5:09 AM.

Details

Reviewers
beanz
rnk
Commits
rG8e42bfd41cf3: Fix how LLVMOPTIONALCOMPONENTS is passed to llvm-build
rL334543: Fix how LLVMOPTIONALCOMPONENTS is passed to llvm-build
Summary

If LLVM_USE_INTEL_JITEVENTS and LLVM_USE_OPROFILE not set, "${LLVMOPTIONALCOMPONENTS}" is empty, but --enable-optional-components need arg, Cause --write-library-table to be skipped parsed.

My CMake version: 3.11.2

execute_process(
  COMMAND ${PYTHON_EXECUTABLE} -B ${LLVMBUILDTOOL}
            --native-target "${LLVM_NATIVE_ARCH}"
            --enable-targets "${LLVM_TARGETS_TO_BUILD}"
            --enable-optional-components "${LLVMOPTIONALCOMPONENTS}"
            --write-library-table ${LLVMCONFIGLIBRARYDEPENDENCIESINC}
            --write-cmake-fragment ${LLVMBUILDCMAKEFRAG}
            OUTPUT_VARIABLE LLVMBUILDOUTPUT
            ERROR_VARIABLE LLVMBUILDERRORS
            OUTPUT_STRIP_TRAILING_WHITESPACE
            ERROR_STRIP_TRAILING_WHITESPACE
  RESULT_VARIABLE LLVMBUILDRESULT)

Diff Detail

Repository
rL LLVM

Event Timeline

fcharlie created this revision.Jun 9 2018, 5:09 AM
Herald added subscribers: llvm-commits, mgorny. · View Herald TranscriptJun 9 2018, 5:09 AM
fcharlie edited the summary of this revision. (Show Details)Jun 9 2018, 5:09 AM
fcharlie added a reviewer: rnk.Jun 9 2018, 4:04 PM
rnk accepted this revision.Jun 11 2018, 9:51 AM

lgtm

This revision is now accepted and ready to land.Jun 11 2018, 9:51 AM
fcharlie added a comment.Jun 11 2018, 4:33 PM

@rnk Please commit this, Thanks

Closed by commit rL334543: Fix how LLVMOPTIONALCOMPONENTS is passed to llvm-build (authored by rnk). · Explain WhyJun 12 2018, 1:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
2 lines

Diff 150622

CMakeLists.txt

Show First 20 Lines • Show All 633 Lines • ▼ Show 20 Lines
# automatically reconfigure outselves. # automatically reconfigure outselves.
set(LLVMBUILDTOOL "${LLVM_MAIN_SRC_DIR}/utils/llvm-build/llvm-build") set(LLVMBUILDTOOL "${LLVM_MAIN_SRC_DIR}/utils/llvm-build/llvm-build")
set(LLVMCONFIGLIBRARYDEPENDENCIESINC set(LLVMCONFIGLIBRARYDEPENDENCIESINC
"${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc") "${LLVM_BINARY_DIR}/tools/llvm-config/LibraryDependencies.inc")
set(LLVMBUILDCMAKEFRAG set(LLVMBUILDCMAKEFRAG
"${LLVM_BINARY_DIR}/LLVMBuild.cmake") "${LLVM_BINARY_DIR}/LLVMBuild.cmake")
set(LLVMOPTIONALCOMPONENTS " ")
# Create the list of optional components that are enabled # Create the list of optional components that are enabled
if (LLVM_USE_INTEL_JITEVENTS) if (LLVM_USE_INTEL_JITEVENTS)
set(LLVMOPTIONALCOMPONENTS IntelJITEvents) set(LLVMOPTIONALCOMPONENTS IntelJITEvents)
endif (LLVM_USE_INTEL_JITEVENTS) endif (LLVM_USE_INTEL_JITEVENTS)
if (LLVM_USE_OPROFILE) if (LLVM_USE_OPROFILE)
set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} OProfileJIT) set(LLVMOPTIONALCOMPONENTS ${LLVMOPTIONALCOMPONENTS} OProfileJIT)
endif (LLVM_USE_OPROFILE) endif (LLVM_USE_OPROFILE)
▲ Show 20 Lines • Show All 379 Lines • Show Last 20 Lines