|
@@ -121,6 +121,7 @@ fedora_rustup_nightly_extras = [
|
|
"RUN dnf install -y wget\n",
|
|
"RUN dnf install -y wget\n",
|
|
"ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo\n",
|
|
"ENV RUSTUP_HOME=/usr/local/rustup CARGO_HOME=/usr/local/cargo\n",
|
|
"ENV RUSTC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc\n",
|
|
"ENV RUSTC=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/rustc\n",
|
|
|
|
+ "ENV CARGO=/usr/local/rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin/cargo\n",
|
|
"RUN set -eux && \\\n",
|
|
"RUN set -eux && \\\n",
|
|
" rustArch='x86_64-unknown-linux-gnu' && \\\n",
|
|
" rustArch='x86_64-unknown-linux-gnu' && \\\n",
|
|
" rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' && \\\n",
|
|
" rustupSha256='6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d' && \\\n",
|
|
@@ -131,10 +132,13 @@ fedora_rustup_nightly_extras = [
|
|
" ./rustup-init -y --no-modify-path --profile default --default-toolchain nightly --default-host ${rustArch} && \\\n",
|
|
" ./rustup-init -y --no-modify-path --profile default --default-toolchain nightly --default-host ${rustArch} && \\\n",
|
|
" chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \\\n",
|
|
" chmod -R a+w $RUSTUP_HOME $CARGO_HOME && \\\n",
|
|
" /usr/local/cargo/bin/rustup --version && \\\n",
|
|
" /usr/local/cargo/bin/rustup --version && \\\n",
|
|
|
|
+ " /usr/local/cargo/bin/rustup run nightly cargo --version && \\\n",
|
|
" /usr/local/cargo/bin/rustup run nightly rustc --version && \\\n",
|
|
" /usr/local/cargo/bin/rustup run nightly rustc --version && \\\n",
|
|
|
|
+ ' test "$CARGO" = "$(/usr/local/cargo/bin/rustup +nightly which cargo)" && \\\n',
|
|
' test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"\n',
|
|
' test "$RUSTC" = "$(/usr/local/cargo/bin/rustup +nightly which rustc)"\n',
|
|
'ENV PATH=$CARGO_HOME/bin:$PATH\n',
|
|
'ENV PATH=$CARGO_HOME/bin:$PATH\n',
|
|
'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli\n',
|
|
'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli\n',
|
|
|
|
+ 'RUN $CARGO --list\n',
|
|
]
|
|
]
|
|
|
|
|
|
ubuntu2204_bindgen_extras = [
|
|
ubuntu2204_bindgen_extras = [
|