diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-12-02 14:10:07 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-12-02 14:10:07 +0100 |
| commit | 12f120d68025e6c52fb517961963d856418e09cc (patch) | |
| tree | cc572a731f3d3b992a12a8b2f093d1a9770e60d9 | |
| parent | 3ed024c53913678e1a557bd66b5bef5be774367e (diff) | |
| parent | 7f037fa720cdc59b0d8aea565cece0911d804085 (diff) | |
| download | mullvadvpn-12f120d68025e6c52fb517961963d856418e09cc.tar.xz mullvadvpn-12f120d68025e6c52fb517961963d856418e09cc.zip | |
Merge branch 'win-fix-linker-err'
| -rw-r--r-- | .github/workflows/daemon.yml | 2 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/cleanup/cleanup.vcxproj | 6 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/log/log.vcxproj | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/.github/workflows/daemon.yml b/.github/workflows/daemon.yml index af840a8834..080cdee7b5 100644 --- a/.github/workflows/daemon.yml +++ b/.github/workflows/daemon.yml @@ -156,7 +156,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1.0.6 with: - toolchain: 1.81 + toolchain: stable target: i686-pc-windows-msvc default: true diff --git a/windows/nsis-plugins/src/cleanup/cleanup.vcxproj b/windows/nsis-plugins/src/cleanup/cleanup.vcxproj index f60a100eb5..324264a0c0 100644 --- a/windows/nsis-plugins/src/cleanup/cleanup.vcxproj +++ b/windows/nsis-plugins/src/cleanup/cleanup.vcxproj @@ -75,7 +75,8 @@ <ModuleDefinitionFile>cleanup.def</ModuleDefinitionFile> </Link> <PreBuildEvent> - <Command>cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis</Command> + <Command>powershell.exe -Command "& { Remove-Item Env:VSTEL_MSBuildProjectFullPath; cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis }" +</Command> <Message>Build mullvad-nsis library</Message> </PreBuildEvent> </ItemDefinitionGroup> @@ -105,7 +106,8 @@ <ModuleDefinitionFile>cleanup.def</ModuleDefinitionFile> </Link> <PreBuildEvent> - <Command>cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis</Command> + <Command>powershell.exe -Command "& { Remove-Item Env:VSTEL_MSBuildProjectFullPath; cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis }" +</Command> <Message>Build mullvad-nsis library</Message> </PreBuildEvent> </ItemDefinitionGroup> diff --git a/windows/nsis-plugins/src/log/log.vcxproj b/windows/nsis-plugins/src/log/log.vcxproj index 7509919f19..b80ae3545f 100644 --- a/windows/nsis-plugins/src/log/log.vcxproj +++ b/windows/nsis-plugins/src/log/log.vcxproj @@ -75,7 +75,8 @@ <ModuleDefinitionFile>log.def</ModuleDefinitionFile> </Link> <PreBuildEvent> - <Command>cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis</Command> + <Command>powershell.exe -Command "& { Remove-Item Env:VSTEL_MSBuildProjectFullPath; cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis }" +</Command> <Message>Build mullvad-nsis library</Message> </PreBuildEvent> </ItemDefinitionGroup> @@ -105,7 +106,8 @@ <ModuleDefinitionFile>log.def</ModuleDefinitionFile> </Link> <PreBuildEvent> - <Command>cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis</Command> + <Command>powershell.exe -Command "& { Remove-Item Env:VSTEL_MSBuildProjectFullPath; cargo build --target i686-pc-windows-msvc --release -p mullvad-nsis }" +</Command> <Message>Build mullvad-nsis library</Message> </PreBuildEvent> </ItemDefinitionGroup> |