Skip to content

Commit 05c0a9d

Browse files
committed
Enable HF targets again
We need to add an CFLAGS env var for armv7-unknown-linux-musleabihf on docker run to make the compiler happy. Error was: ``` warning: cc1: error: '-mfloat-abi=hard': selected processor lacks an FPU ``` Can be fixed by using either of them: export CFLAGS_armv7_unknown_linux_musleabihf='-mfpu=vfpv3-d16' export CFLAGS_armv7_unknown_linux_musleabihf='-mfpu=neon' References: - influxdata/flux#3379 (comment) - https://wiki.debian.org/ArmHardFloatPort/VfpComparison#FPU Per documentation I use "vfpv3-d16" for the CI step. In the end the user this cross compiler tool needs to make the appropriate decision in their projects.
1 parent f4984d6 commit 05c0a9d

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

.github/workflows/Build.yml

+17-12
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ jobs:
2121
TARGET: arm-unknown-linux-musleabi
2222
OPENSSL_ARCH: linux-generic32
2323
RUST_MUSL_MAKE_CONFIG: config.mak.32
24-
# TODO: REENABLE WHEN SOLUTION FOUND
25-
# - IMAGE_TAG: arm-musleabihf
26-
# TARGET: arm-unknown-linux-musleabihf
27-
# RUST_MUSL_MAKE_CONFIG: config.mak.32
28-
# OPENSSL_ARCH: linux-generic32
24+
- IMAGE_TAG: arm-musleabihf
25+
TARGET: arm-unknown-linux-musleabihf
26+
OPENSSL_ARCH: linux-generic32
27+
RUST_MUSL_MAKE_CONFIG: config.mak.32
2928
- IMAGE_TAG: armv5te-musleabi
3029
TARGET: armv5te-unknown-linux-musleabi
3130
OPENSSL_ARCH: linux-generic32
@@ -34,11 +33,10 @@ jobs:
3433
TARGET: armv7-unknown-linux-musleabi
3534
OPENSSL_ARCH: linux-generic32
3635
RUST_MUSL_MAKE_CONFIG: config.mak.32
37-
# TODO: REENABLE WHEN SOLUTION FOUND
38-
# - IMAGE_TAG: armv7-musleabihf
39-
# TARGET: armv7-unknown-linux-musleabihf
40-
# OPENSSL_ARCH: linux-generic32
41-
# RUST_MUSL_MAKE_CONFIG: config.mak.32
36+
- IMAGE_TAG: armv7-musleabihf
37+
TARGET: armv7-unknown-linux-musleabihf
38+
OPENSSL_ARCH: linux-generic32
39+
RUST_MUSL_MAKE_CONFIG: config.mak.32
4240
- IMAGE_TAG: i586-musl
4341
TARGET: i586-unknown-linux-musl
4442
OPENSSL_ARCH: linux-elf
@@ -70,8 +68,15 @@ jobs:
7068
- uses: actions/checkout@v2
7169
- name: Build Docker image
7270
run: |
73-
docker build --build-arg TARGET="$TARGET" --build-arg OPENSSL_ARCH="$OPENSSL_ARCH" --build-arg RUST_MUSL_MAKE_CONFIG="$RUST_MUSL_MAKE_CONFIG" -t messense/rust-musl-cross:$IMAGE_TAG .
74-
docker run --rm -v "$(pwd)/tests":/home/rust/src messense/rust-musl-cross:$IMAGE_TAG cargo build
71+
docker build \
72+
--build-arg TARGET="$TARGET" \
73+
--build-arg OPENSSL_ARCH="$OPENSSL_ARCH" \
74+
--build-arg RUST_MUSL_MAKE_CONFIG="$RUST_MUSL_MAKE_CONFIG" \
75+
-t messense/rust-musl-cross:$IMAGE_TAG .
76+
docker run --rm \
77+
-e CFLAGS_armv7_unknown_linux_musleabihf='-mfpu=vfpv3-d16' \
78+
-v "$(pwd)/tests":/home/rust/src \
79+
messense/rust-musl-cross:$IMAGE_TAG cargo build
7580
- name: Push Docker image
7681
if: github.ref == 'refs/heads/master'
7782
run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} && docker push messense/rust-musl-cross:$IMAGE_TAG

0 commit comments

Comments
 (0)