Fix macOS and Linux native builders
This commit is contained in:
1 parent
719b384b38
commit
f0cdd65937
2 files changed
+2
-6
No files matched your search
@@ -162,7 +162,7 @@ jobs:
|
|||||||
include:
|
include:
|
||||||
- rid: osx-x64
|
- rid: osx-x64
|
||||||
target_cpu: x64
|
target_cpu: x64
|
||||||
runner: macos-14
|
runner: macos-15
|
||||||
- rid: osx-arm64
|
- rid: osx-arm64
|
||||||
target_cpu: arm64
|
target_cpu: arm64
|
||||||
runner: macos-15
|
runner: macos-15
|
||||||
|
|||||||
@@ -279,17 +279,13 @@ build_angle() {
|
|||||||
gclient sync -f -D -R
|
gclient sync -f -D -R
|
||||||
|
|
||||||
local out_dir="$src/out/linux-static-$TARGET_CPU"
|
local out_dir="$src/out/linux-static-$TARGET_CPU"
|
||||||
local angle_is_clang="false"
|
|
||||||
if is_musl_rid; then
|
|
||||||
angle_is_clang="true"
|
|
||||||
fi
|
|
||||||
mkdir -p "$out_dir"
|
mkdir -p "$out_dir"
|
||||||
cat >"$out_dir/args.gn" <<EOF_ARGS
|
cat >"$out_dir/args.gn" <<EOF_ARGS
|
||||||
target_os = "linux"
|
target_os = "linux"
|
||||||
target_cpu = "$TARGET_CPU"
|
target_cpu = "$TARGET_CPU"
|
||||||
is_debug = false
|
is_debug = false
|
||||||
is_component_build = false
|
is_component_build = false
|
||||||
is_clang = $angle_is_clang
|
is_clang = true
|
||||||
treat_warnings_as_errors = false
|
treat_warnings_as_errors = false
|
||||||
use_custom_libcxx = false
|
use_custom_libcxx = false
|
||||||
use_sysroot = false
|
use_sysroot = false
|
||||||
|
|||||||
Reference in new issue
Block a user