Skip to content

Commit 48a9032

Browse files
committed
WIP windows linker error fix
1 parent 89ba09d commit 48a9032

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/assets.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
DEPOT_TOOLS_WIN_TOOLCHAIN: 0
88
WINDOWSSDKDIR: 'C:/Program Files (x86)/Windows Kits/10/'
99
UPLOAD_DIR: ${{ github.workspace }}/assets
10+
WINDOWS_SDK_VERSION: '10.0.26100.0' # for build_impeller.sh's gn invocation
1011
jobs:
1112
build:
1213
runs-on: ${{ matrix.os }}-latest
@@ -28,7 +29,7 @@ jobs:
2829
sudo rm -rf /usr/share/dotnet
2930
sudo rm -rf /opt/ghc
3031
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
31-
32+
3233
- name: Install Windows SDK on Windows
3334
if: matrix.os == 'windows'
3435
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2.4

build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ fn main() {
66
use std::path::{Path, PathBuf};
77

88
const STATIC_MAJOR: u32 = 0;
9-
const STATIC_MINOR: u32 = 2;
10-
const STATIC_PATCH: u32 = 1;
9+
const STATIC_MINOR: u32 = 3;
10+
const STATIC_PATCH: u32 = 0;
1111
// gather variables
1212
let out_dir = std::path::Path::new(&std::env::var("OUT_DIR").unwrap()).to_owned();
1313
let profile = cfg!(feature = "debug_static_link")

build_impeller.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313
# sanity checks and start build
1414
rm -rf "$OUT_DIR" # clean out any old build files
1515
ls -lh "$UPLOAD_DIR" # list for sanity
16-
./engine/src/flutter/tools/gn ${USE_CCACHE:+"$USE_CCACHE"} --runtime-mode="$PROFILE" --prebuilt-dart-sdk --no-goma --no-build-engine-artifacts --no-enable-unittests --no-lto --target-dir=out # lto makes static libs huge and unstrippable
16+
./engine/src/flutter/tools/gn ${USE_CCACHE:+"$USE_CCACHE"} --runtime-mode="$PROFILE" --prebuilt-dart-sdk --no-goma --no-build-engine-artifacts --no-enable-unittests --no-lto --target-dir=out --windows_sdk_version="$WINDOWS_SDK_VERSION" # lto makes static libs huge and unstrippable
1717
cat "$OUT_DIR"/args.gn ||: # displays the gn args
1818
ninja -C "$OUT_DIR" flutter/impeller/toolkit/interop:library_static
1919
# prepare for archive

0 commit comments

Comments
 (0)