From 5c1a4f79c44cd1088dd66a55556d4bac605d8eee Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Wed, 29 Sep 2021 19:39:56 +0700 Subject: [PATCH] [K/N] Minor LLVM builder fixes --- kotlin-native/tools/llvm_builder/README.md | 8 +++----- kotlin-native/tools/llvm_builder/package.py | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/kotlin-native/tools/llvm_builder/README.md b/kotlin-native/tools/llvm_builder/README.md index fce0691bfc8..60f35a49273 100644 --- a/kotlin-native/tools/llvm_builder/README.md +++ b/kotlin-native/tools/llvm_builder/README.md @@ -28,7 +28,7 @@ To build only essential parts, run the following command: ``` python3 package.py --build-targets install-distribution --distribution-components $DISTRIBUTION_COMPONENTS ``` -Set of required `$DISTRIBUTION_COMPONENTS` is depends on OS: +Set of required `$DISTRIBUTION_COMPONENTS` depends on OS: | OS | Distribution components | | --- | --- | @@ -54,10 +54,8 @@ You can use Docker to build LLVM for Linux: ```shell docker build -t kotlin-llvm-builder . docker run --rm -it -v :/output kotlin-llvm-builder --install-path /output/llvm-11.1.0-linux-x64 --pack - ``` ### Known problems -1. Bootstrap build is not working on macOS for default git branch. -2. `libcxx` and `compiler-rt` are built as projects, not runtimes. -3. No way to run LLVM tests out of the box. +1. `libcxx` and `compiler-rt` are built as projects, not runtimes. +2. No way to run LLVM tests out of the box. diff --git a/kotlin-native/tools/llvm_builder/package.py b/kotlin-native/tools/llvm_builder/package.py index f32bf051569..e5374939c97 100644 --- a/kotlin-native/tools/llvm_builder/package.py +++ b/kotlin-native/tools/llvm_builder/package.py @@ -138,7 +138,6 @@ def construct_cmake_flags( cxx_flags = ['-isysroot', isysroot, '-stdlib=libc++'] linker_flags = ['-stdlib=libc++'] - if host_is_darwin(): cmake_args.append('-DLLVM_ENABLE_LIBCXX=ON') if building_bootstrap: @@ -263,7 +262,7 @@ def build_parser() -> argparse.ArgumentParser: parser = argparse.ArgumentParser(description="Build LLVM toolchain for Kotlin/Native") # Output configuration. parser.add_argument("--install-path", type=str, default="llvm-distribution", required=False, - help="Where final LLVM distribution will be enabled") + help="Where final LLVM distribution will be installed") parser.add_argument("--pack", action='store_true', help="Create an archive and its sha256 for final distribution at `--install-path`") parser.add_argument("--build-targets", default=["install"],