Selaa lähdekoodia

Fix armv6 build, thanks to @dani-garcia for the review!

Robin Schneider 6 vuotta sitten
vanhempi
sitoutus
078b21db85
3 muutettua tiedostoa jossa 11 lisäystä ja 0 poistoa
  1. 5 0
      docker/Dockerfile.j2
  2. 3 0
      docker/armv6/mysql/Dockerfile
  3. 3 0
      docker/armv6/sqlite/Dockerfile

+ 5 - 0
docker/Dockerfile.j2

@@ -182,6 +182,9 @@ RUN rustup target add x86_64-unknown-linux-musl
 {% elif "aarch64" in target_file %}
 RUN rustup target add aarch64-unknown-linux-gnu
 
+{% elif "armv6" in target_file %}
+RUN rustup target add arm-unknown-linux-gnueabi
+
 {% endif %}
 # Builds your dependencies and removes the
 # dummy project, except the target folder
@@ -202,6 +205,8 @@ RUN touch src/main.rs
 RUN cargo build --features ${DB} --release
 {% elif "aarch64" in target_file %}
 RUN cargo build --features ${DB} --release --target=aarch64-unknown-linux-gnu
+{% elif "armv6" in target_file %}
+RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
 {% endif %}
 
 ######################## RUNTIME IMAGE  ########################

+ 3 - 0
docker/armv6/mysql/Dockerfile

@@ -77,6 +77,8 @@ ENV CC_arm_unknown_linux_gnueabi="/usr/bin/arm-linux-gnueabi-gcc"
 ENV CROSS_COMPILE="1"
 ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabi"
 ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi"
+RUN rustup target add arm-unknown-linux-gnueabi
+
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
@@ -92,6 +94,7 @@ RUN touch src/main.rs
 
 # Builds again, this time it'll just be
 # your actual source files being built
+RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
 
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image

+ 3 - 0
docker/armv6/sqlite/Dockerfile

@@ -71,6 +71,8 @@ ENV CC_arm_unknown_linux_gnueabi="/usr/bin/arm-linux-gnueabi-gcc"
 ENV CROSS_COMPILE="1"
 ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabi"
 ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi"
+RUN rustup target add arm-unknown-linux-gnueabi
+
 # Builds your dependencies and removes the
 # dummy project, except the target folder
 # This folder contains the compiled dependencies
@@ -86,6 +88,7 @@ RUN touch src/main.rs
 
 # Builds again, this time it'll just be
 # your actual source files being built
+RUN cargo build --features ${DB} --release --target=arm-unknown-linux-gnueabi
 
 ######################## RUNTIME IMAGE  ########################
 # Create a new stage with a minimal image