Skip to content

Commit

Permalink
Adds zstd
Browse files Browse the repository at this point in the history
  • Loading branch information
@ultimaweapon
ultimaweapon committed Oct 6, 2023
1 parent c9ec524 commit 4f3a889
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
name: Build
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
include:
- os: ubuntu-latest
parallel: 2
Expand All @@ -37,7 +38,7 @@ jobs:
deps: ./build-deps.sh
cli: ./build-cli.sh
dist: ./build-dist.sh
artifact: nitro-mac-iniversal
artifact: nitro-mac
- os: windows-latest
parallel: 2
setup: |
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "deps/llvm"]
path = deps/llvm
url = https://github.com/llvm/llvm-project.git
[submodule "deps/zstd"]
path = deps/zstd
url = https://github.com/facebook/zstd.git
28 changes: 28 additions & 0 deletions build-deps.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,31 @@ cmake --install "$PSScriptRoot/deps/llvm/build" --config Release
if ($LASTEXITCODE -ne 0) {
exit 1
}

# zstd
cmake `
--install-prefix "$PSScriptRoot/lib/zstd" `
-DCMAKE_BUILD_TYPE:STRING=Release `
-DZSTD_LEGACY_SUPPORT:BOOL=OFF `
-DZSTD_MULTITHREAD_SUPPORT:BOOL=OFF `
-DZSTD_BUILD_PROGRAMS:BOOL=OFF `
-DZSTD_BUILD_SHARED:BOOL=OFF `
-Wno-dev `
-B "$PSScriptRoot/deps/zstd/build/cmake/build" `
"$PSScriptRoot/deps/zstd/build/cmake"

if ($LASTEXITCODE -ne 0) {
exit 1
}

cmake --build "$PSScriptRoot/deps/zstd/build/cmake/build" --config Release

if ($LASTEXITCODE -ne 0) {
exit 1
}

cmake --install "$PSScriptRoot/deps/zstd/build/cmake/build" --config Release

if ($LASTEXITCODE -ne 0) {
exit 1
}
15 changes: 15 additions & 0 deletions build-deps.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,18 @@ cmake \

cmake --build "$dir/deps/llvm/build" --config Release
cmake --install "$dir/deps/llvm/build" --config Release

# zstd
cmake \
--install-prefix "$dir/lib/zstd" \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DZSTD_LEGACY_SUPPORT:BOOL=OFF \
-DZSTD_MULTITHREAD_SUPPORT:BOOL=OFF \
-DZSTD_BUILD_PROGRAMS:BOOL=OFF \
-DZSTD_BUILD_SHARED:BOOL=OFF \
-Wno-dev \
-B "$dir/deps/zstd/build/cmake/build" \
"$dir/deps/zstd/build/cmake"

cmake --build "$dir/deps/zstd/build/cmake/build" --config Release
cmake --install "$dir/deps/zstd/build/cmake/build" --config Release
2 changes: 1 addition & 1 deletion deps/llvm
Submodule llvm updated 54 files
+3 −0 .github/workflows/llvm-tests.yml
+14 −3 .github/workflows/release-tasks.yml
+15 −3 clang/include/clang/Tooling/DependencyScanning/DependencyScanningFilesystem.h
+12 −5 clang/lib/AST/ExprConstant.cpp
+5 −2 clang/lib/Driver/ToolChains/MinGW.cpp
+1 −2 clang/lib/Frontend/TextDiagnostic.cpp
+2 −0 clang/lib/Headers/CMakeLists.txt
+9 −0 clang/lib/Headers/cuda_wrappers/bits/basic_string.h
+9 −0 clang/lib/Headers/cuda_wrappers/bits/basic_string.tcc
+5 −1 clang/lib/Sema/SemaChecking.cpp
+64 −15 clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
+38 −0 clang/test/ClangScanDeps/relative-filenames.c
+10 −0 clang/test/Driver/mingw-linker-options.c
+45 −3 clang/test/FixIt/format.cpp
+19 −0 clang/test/Misc/diag-style.cpp
+13 −0 clang/test/SemaCXX/cxx2a-virtual-base-used.cpp
+19 −0 compiler-rt/CMakeLists.txt
+1 −1 libcxx/include/__config
+2 −2 libcxx/include/__utility/pair.h
+31 −0 libcxx/test/std/utilities/utility/pairs/pairs.pair/ctor.pair_like.pass.cpp
+22 −20 lld/COFF/Driver.cpp
+1 −1 lld/COFF/Writer.cpp
+1 −1 lld/Common/Filesystem.cpp
+40 −170 lld/test/COFF/guard-ehcont.s
+18 −14 lld/test/COFF/print-search-paths.s
+0 −24 lldb/cmake/modules/LLDBConfig.cmake
+13 −0 lldb/cmake/modules/LLDBStandalone.cmake
+4 −6 lldb/source/API/CMakeLists.txt
+1 −1 llvm/CMakeLists.txt
+10 −0 llvm/include/llvm/Transforms/Utils/Local.h
+6 −14 llvm/lib/Analysis/InlineCost.cpp
+14 −48 llvm/lib/CodeGen/StackColoring.cpp
+1 −1 llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
+3 −1 llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+23 −5 llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+6 −1 llvm/lib/Transforms/Scalar/GVN.cpp
+14 −9 llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp
+34 −27 llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp
+24 −7 llvm/lib/Transforms/Utils/Local.cpp
+14 −14 llvm/test/CodeGen/AArch64/arm64ec-varargs.ll
+49 −15 llvm/test/CodeGen/AArch64/sve-calling-convention-mixed.ll
+75 −0 llvm/test/CodeGen/PowerPC/pgo-ref-directive.ll
+10 −0 llvm/test/CodeGen/X86/code-model-elf-sections.ll
+190 −0 llvm/test/CodeGen/X86/stack-coloring-wineh.ll
+103 −0 llvm/test/Transforms/GVN/pr64598.ll
+71 −0 llvm/test/Transforms/GVN/pr65447.ll
+0 −36 llvm/test/Transforms/Inline/target-features-vs-alwaysinline.ll
+18 −0 llvm/test/Transforms/MemCpyOpt/memcpy.ll
+260 −0 llvm/test/Transforms/SimpleLoopUnswitch/inject-invariant-conditions-exponential.ll
+35 −20 llvm/test/Transforms/SimpleLoopUnswitch/inject-invariant-conditions.ll
+14 −16 llvm/tools/llvm-readobj/COFFDumper.cpp
+1 −1 llvm/utils/gn/secondary/llvm/version.gni
+1 −1 llvm/utils/lit/lit/__init__.py
+1 −1 llvm/utils/release/export.sh
1 change: 1 addition & 0 deletions deps/zstd
Submodule zstd added at 63779c

0 comments on commit 4f3a889

Please sign in to comment.