[all-commits] [llvm/llvm-project] 9383e9: Fix lld macho standalone build by including llvm/C...

Nico Weber via All-commits all-commits at lists.llvm.org
Wed May 19 08:15:38 PDT 2021


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 9383e9c1e627b49cc1c80c2e6117132734a2fba8
      https://github.com/llvm/llvm-project/commit/9383e9c1e627b49cc1c80c2e6117132734a2fba8
  Author: Mariusz Ceier <mceier+llvm at gmail.com>
  Date:   2021-05-19 (Wed, 19 May 2021)

  Changed paths:
    M lld/CMakeLists.txt
    M lld/MachO/CMakeLists.txt
    M lld/MachO/Driver.cpp
    M lld/MachO/SyntheticSections.cpp
    M lld/test/CMakeLists.txt
    M lld/test/lit.site.cfg.py.in
    M lld/tools/lld/CMakeLists.txt
    M llvm/cmake/config-ix.cmake
    M llvm/cmake/modules/LLVMConfig.cmake.in
    M llvm/include/llvm/Config/config.h.cmake
    M llvm/include/llvm/Config/llvm-config.h.cmake
    M llvm/test/CMakeLists.txt
    M llvm/test/lit.site.cfg.py.in
    M llvm/tools/llvm-objdump/CMakeLists.txt
    M llvm/tools/llvm-objdump/MachODump.cpp
    M llvm/utils/gn/secondary/lld/test/BUILD.gn
    M llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
    M llvm/utils/gn/secondary/llvm/test/BUILD.gn

  Log Message:
  -----------
  Fix lld macho standalone build by including llvm/Config/llvm-config.h instead of llvm/Config/config.h

lld/MachO/Driver.cpp and lld/MachO/SyntheticSections.cpp include
llvm/Config/config.h which doesn't exist when building standalone lld.

This patch replaces llvm/Config/config.h include with llvm/Config/llvm-config.h
just like it is in lld/ELF/Driver.cpp and HAVE_LIBXAR with LLVM_HAVE_LIXAR and
moves LLVM_HAVE_LIBXAR from config.h to llvm-config.h

Also it adds LLVM_HAVE_LIBXAR to LLVMConfig.cmake and links liblldMachO2.so
with XAR_LIB if LLVM_HAVE_LIBXAR is set.

Differential Revision: https://reviews.llvm.org/D102084




More information about the All-commits mailing list