azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Minor LLVM builder fixes

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-09-29 19:39:56 +07:00
committed by Space
parent 7a3f33ad0b
commit 5c1a4f79c4
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/tools/llvm_builder/README.md
+3 -5
View File
@@ -28,7 +28,7 @@ To build only essential parts, run the following command:
``` ```
python3 package.py --build-targets install-distribution --distribution-components $DISTRIBUTION_COMPONENTS 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 | | OS | Distribution components |
| --- | --- | | --- | --- |
@@ -54,10 +54,8 @@ You can use Docker to build LLVM for Linux:
```shell ```shell
docker build -t kotlin-llvm-builder . docker build -t kotlin-llvm-builder .
docker run --rm -it -v <HOST_PATH>:/output kotlin-llvm-builder --install-path /output/llvm-11.1.0-linux-x64 --pack docker run --rm -it -v <HOST_PATH>:/output kotlin-llvm-builder --install-path /output/llvm-11.1.0-linux-x64 --pack
``` ```
### Known problems ### Known problems
1. Bootstrap build is not working on macOS for default git branch. 1. `libcxx` and `compiler-rt` are built as projects, not runtimes.
2. `libcxx` and `compiler-rt` are built as projects, not runtimes. 2. No way to run LLVM tests out of the box.
3. No way to run LLVM tests out of the box.
kotlin-native/tools/llvm_builder/package.py
+1 -2
View File
@@ -138,7 +138,6 @@ def construct_cmake_flags(
cxx_flags = ['-isysroot', isysroot, '-stdlib=libc++'] cxx_flags = ['-isysroot', isysroot, '-stdlib=libc++']
linker_flags = ['-stdlib=libc++'] linker_flags = ['-stdlib=libc++']
if host_is_darwin(): if host_is_darwin():
cmake_args.append('-DLLVM_ENABLE_LIBCXX=ON') cmake_args.append('-DLLVM_ENABLE_LIBCXX=ON')
if building_bootstrap: if building_bootstrap:
@@ -263,7 +262,7 @@ def build_parser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser(description="Build LLVM toolchain for Kotlin/Native") parser = argparse.ArgumentParser(description="Build LLVM toolchain for Kotlin/Native")
# Output configuration. # Output configuration.
parser.add_argument("--install-path", type=str, default="llvm-distribution", required=False, 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', parser.add_argument("--pack", action='store_true',
help="Create an archive and its sha256 for final distribution at `--install-path`") help="Create an archive and its sha256 for final distribution at `--install-path`")
parser.add_argument("--build-targets", default=["install"], parser.add_argument("--build-targets", default=["install"],