OSDN Git Service

Revert "Fix how LLVMOPTIONALCOMPONENTS is passed to llvm-build"
authorAhmed Bougacha <ahmed.bougacha@gmail.com>
Wed, 13 Jun 2018 02:16:01 +0000 (02:16 +0000)
committerAhmed Bougacha <ahmed.bougacha@gmail.com>
Wed, 13 Jun 2018 02:16:01 +0000 (02:16 +0000)
This reverts commit r334543.

My understanding is, that commit is intended to make the llvm-build
invocation have a correct "--enable-optional-components" value, but:
- it already has a value: it's quoted in the command line a few lines
  below, and, if I hack llvm-build to print sys.argv, it does look correct:
    -- llvm-build output: ['.../utils/llvm-build/llvm-build',
      '--native-target', 'X86', '--enable-targets', 'X86;ARM;AArch64',
      '--enable-optional-components', '',
      '--write-library-table',
      '.../build/tools/llvm-config/LibraryDependencies.inc',
      '--write-cmake-fragment', '.../build/LLVMBuild.cmake']
- the " " string seems to evaluate to TRUE in CMake (*sigh*), so this
  basically force-enables LLVM_USE_INTEL_JITEVENTS, regardless of the
  value of the option.
  On Darwin, JITEvents is not supported, so this bypasses that OS check
  but is guaranteed to fail later.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@334566 91177308-0d34-0410-b5e6-96231b3b80d8

CMakeLists.txt

index 40fcfeb..a208587 100644 (file)
@@ -640,7 +640,6 @@ set(LLVMBUILDCMAKEFRAG
   "${LLVM_BINARY_DIR}/LLVMBuild.cmake")
 
 # Create the list of optional components that are enabled
-set(LLVM_USE_INTEL_JITEVENTS " ")
 if (LLVM_USE_INTEL_JITEVENTS)
   set(LLVMOPTIONALCOMPONENTS IntelJITEvents)
 endif (LLVM_USE_INTEL_JITEVENTS)