Skip to content

Commit ef3d571

Browse files
committed
Will compile linux/arm/v7 to "armv7" arch instead of "armv7hf" arch.
1 parent d137b6a commit ef3d571

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

docker/MQTTManager/CMakeUserPresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"conan": {}
55
},
66
"include": [
7-
"build/Release/generators/CMakePresets.json",
87
"build/Debug/generators/CMakePresets.json"
98
]
109
}

docker/MQTTManager/compile_mqttmanager.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ elif [ "$TARGETPLATFORM" == "linux/arm/v6" ]; then
5555
echo "LD=arm-linux-gnueabihf-ld" >>/root/.conan2/profiles/host
5656
elif [ "$TARGETPLATFORM" == "linux/arm/v7" ]; then
5757
deb_add_arch="armhf"
58-
conan_target_arch="armv7hf"
58+
conan_target_arch="armv7"
5959
strip_bin="/usr/bin/arm-linux-gnueabihf-strip"
6060
apt -y install binutils-arm-linux-gnueabihf gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
6161
echo "" >>/root/.conan2/profiles/host

0 commit comments

Comments
 (0)