From 23c6eb92813fd0941ee9fc8b07e314e94955717d Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 4 Jan 2019 17:11:46 +0000 Subject: [PATCH] [gn build] Add build files for llvm/lib/{LineEditor,Testing/Support,TextAPI} Nothing pulls them in yet, but they will be needed for check-llvm. LineEditor depends on libedit, so create a gn/build/lib for it, following the usual pattern. Differential Revision: https://reviews.llvm.org/D56316 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@350407 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/gn/build/libs/edit/BUILD.gn | 12 ++++++++++++ utils/gn/build/libs/edit/enable.gni | 3 +++ utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn | 9 +++++++-- utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn | 12 ++++++++++++ utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn | 12 ++++++++++++ utils/gn/secondary/llvm/lib/TextAPI/BUILD.gn | 12 ++++++++++++ 6 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 utils/gn/build/libs/edit/BUILD.gn create mode 100644 utils/gn/build/libs/edit/enable.gni create mode 100644 utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn create mode 100644 utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn create mode 100644 utils/gn/secondary/llvm/lib/TextAPI/BUILD.gn diff --git a/utils/gn/build/libs/edit/BUILD.gn b/utils/gn/build/libs/edit/BUILD.gn new file mode 100644 index 00000000000..c22a7e60052 --- /dev/null +++ b/utils/gn/build/libs/edit/BUILD.gn @@ -0,0 +1,12 @@ +import("//llvm/utils/gn/build/libs/edit/enable.gni") + +config("edit_config") { + visibility = [ ":edit" ] + libs = [ "edit" ] +} + +group("edit") { + if (llvm_enable_libedit) { + public_configs = [ ":edit_config" ] + } +} diff --git a/utils/gn/build/libs/edit/enable.gni b/utils/gn/build/libs/edit/enable.gni new file mode 100644 index 00000000000..b973b0e032c --- /dev/null +++ b/utils/gn/build/libs/edit/enable.gni @@ -0,0 +1,3 @@ +declare_args() { + llvm_enable_libedit = host_os == "mac" +} diff --git a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn index 38ec86d82f3..44ad0a035aa 100644 --- a/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -1,6 +1,7 @@ import("//llvm/lib/Target/targets.gni") import("//llvm/triples.gni") import("//llvm/utils/gn/build/buildflags.gni") +import("//llvm/utils/gn/build/libs/edit/enable.gni") import("//llvm/utils/gn/build/libs/pthread/enable.gni") import("//llvm/utils/gn/build/libs/terminfo/enable.gni") import("//llvm/utils/gn/build/libs/xar/enable.gni") @@ -178,7 +179,6 @@ action("config") { "HAVE_CRASHREPORTER_INFO=1", "HAVE_DECL_ARC4RANDOM=1", "HAVE_DLADDR=1", - "HAVE_LIBEDIT=1", "HAVE_MALLOC_H=", "HAVE_MACH_MACH_H=1", "HAVE_MALLOC_MALLOC_H=1", @@ -190,7 +190,6 @@ action("config") { "HAVE_CRASHREPORTER_INFO=", "HAVE_DECL_ARC4RANDOM=", "HAVE_DLADDR=", - "HAVE_LIBEDIT=", "HAVE_MACH_MACH_H=", "HAVE_MALLOC_H=1", "HAVE_MALLOC_MALLOC_H=", @@ -292,6 +291,12 @@ action("config") { args += [ "LTDL_SHLIB_EXT=.dll" ] } + if (llvm_enable_libedit) { + args += [ "HAVE_LIBEDIT=1" ] + } else { + args += [ "HAVE_LIBEDIT=" ] + } + if (llvm_enable_libxar) { args += [ "HAVE_LIBXAR=1" ] } else { diff --git a/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn b/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn new file mode 100644 index 00000000000..b8f618533bc --- /dev/null +++ b/utils/gn/secondary/llvm/lib/LineEditor/BUILD.gn @@ -0,0 +1,12 @@ +static_library("LineEditor") { + output_name = "LLVMLineEditor" + deps = [ + "//llvm/include/llvm/Config:config", + "//llvm/lib/Support", + "//llvm/utils/gn/build/libs/edit", + ] + + sources = [ + "LineEditor.cpp", + ] +} diff --git a/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn b/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn new file mode 100644 index 00000000000..064d5ec2c86 --- /dev/null +++ b/utils/gn/secondary/llvm/lib/Testing/Support/BUILD.gn @@ -0,0 +1,12 @@ +static_library("Support") { + output_name = "LLVMTestingSupport" + deps = [ + "//llvm/lib/Support", + "//llvm/utils/unittest:gtest", + ] + sources = [ + "Error.cpp", + "SupportHelpers.cpp", + ] + testonly = true +} diff --git a/utils/gn/secondary/llvm/lib/TextAPI/BUILD.gn b/utils/gn/secondary/llvm/lib/TextAPI/BUILD.gn new file mode 100644 index 00000000000..0daf58b598c --- /dev/null +++ b/utils/gn/secondary/llvm/lib/TextAPI/BUILD.gn @@ -0,0 +1,12 @@ +static_library("TextAPI") { + output_name = "LLVMTextAPI" + deps = [ + "//llvm/lib/BinaryFormat", + "//llvm/lib/Support", + ] + include_dirs = [ "." ] + sources = [ + "ELF/ELFStub.cpp", + "ELF/TBEHandler.cpp", + ] +} -- 2.50.1