diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2022-10-26 12:52:03 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2022-10-26 12:52:03 +0200 |
| commit | 72c198d1c25443fe168f2ac460d0835193dad3dd (patch) | |
| tree | 2e818cbd54e033d13dd4bb04ec85eb6ab4d5f751 | |
| parent | 7ab6519535c90087e4edc2aa70a15a133c0cb1f2 (diff) | |
| parent | cff9af6362ce16ddf9180678e8762579cb8b6a4e (diff) | |
| download | mullvadvpn-72c198d1c25443fe168f2ac460d0835193dad3dd.tar.xz mullvadvpn-72c198d1c25443fe168f2ac460d0835193dad3dd.zip | |
Merge branch 'improve-arm-build-docker-image'
| -rw-r--r-- | Dockerfile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Dockerfile b/Dockerfile index f32ea89d76..e036834cc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,13 +47,8 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ sh -s -- --default-toolchain stable --profile minimal --target aarch64-unknown-linux-gnu -y ENV PATH=/root/.cargo/bin:$PATH - -RUN echo '[target.aarch64-unknown-linux-gnu]\n\ -linker = "aarch64-linux-gnu-gcc"\n\ -\n\ -[target.aarch64-unknown-linux-gnu.dbus]\n\ -rustc-link-search = ["/usr/aarch64-linux-gnu/lib"]\n\ -rustc-link-lib = ["dbus-1"]' > /root/.cargo/config.toml +ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER="aarch64-linux-gnu-gcc" \ + PKG_CONFIG_SYSROOT_DIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-linux-gnu # === Volta for npm + node === |