Removed .cargo/config.toml and use RUSTFLAGS instead

ref: rust-lang/cargo#6858
This commit is contained in:
zonyitoo
2020-08-20 15:55:28 +08:00
parent 4493c55235
commit 4fd4ac5bbe
7 changed files with 9 additions and 17 deletions

View File

@@ -1,9 +0,0 @@
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))']
rustflags = [
"-Ctarget-feature=+aes,+ssse3",
]
[target.'cfg(target_arch = "aarch64")']
rustflags = [
"-Ctarget-feature=+aes,+crypto,+neon",
]

View File

@@ -46,6 +46,7 @@ jobs:
runs-on: ${{ matrix.os }}
env:
BUILD_EXTRA_FEATURES: "openssl-vendored local-redir"
RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3"
strategy:
matrix:
# os: [ubuntu-latest, macos-latest]
@@ -69,6 +70,8 @@ jobs:
build-windows:
runs-on: windows-latest
env:
RUSTFLAGS: "-Ctarget-feature=+aes,+ssse3"
# env:
# OPENSSL_STATIC: "1"
# OPENSSL_DIR: "C:\\Program Files\\OpenSSL-Win64\\"

View File

@@ -1,3 +1,3 @@
FROM rustembedded/cross:aarch64-unknown-linux-gnu
# ENV RUSTFLAGS="-Ctarget-feature=+aes,+neon"
ENV RUSTFLAGS="-Ctarget-feature=+aes,+neon,+crypto"

View File

@@ -1,3 +1,3 @@
FROM rustembedded/cross:arm-unknown-linux-gnueabihf
# ENV RUSTFLAGS="-Ctarget-feature=+aes"
ENV RUSTFLAGS="-Ctarget-feature=+aes"

View File

@@ -19,7 +19,5 @@ RUN curl -LO https://download.libsodium.org/libsodium/releases/libsodium-$SODIUM
V=1 make -j${nprocs} && make install && \
cd .. && rm -rf libsodium-$SODIUM_VERS.tar.gz libsodium-$SODIUM_VERS
# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" \
# SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib
ENV SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib
ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3" \
SODIUM_LIB_DIR=/usr/x86_64-w64-mingw32/lib

View File

@@ -1,3 +1,3 @@
FROM rustembedded/cross:x86_64-unknown-linux-gnu
# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"
ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"

View File

@@ -1,3 +1,3 @@
FROM rustembedded/cross:x86_64-unknown-linux-musl
# ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"
ENV RUSTFLAGS="-Ctarget-feature=+aes,+ssse3"