Merge remote-tracking branch 'origin/stable' into dev

.drone.jsonnet

@@ -214,7 +214,8 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra
     // Static build (on bionic) which gets uploaded to builds.lokinet.dev:
     debian_pipeline("Static (bionic amd64)", "ubuntu:bionic", deps='g++-8 python3-dev', lto=true,
                     cmake_extra='-DBUILD_STATIC_DEPS=ON -DBUILD_SHARED_LIBS=OFF -DSTATIC_LINK=ON -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ' +
-                        '-DNATIVE_BUILD=OFF -DWITH_SYSTEMD=OFF',
+                        '-DCMAKE_CXX_FLAGS="-march=x86-64 -mtune=haswell" -DCMAKE_C_FLAGS="-march=x86-64 -mtune=haswell" -DNATIVE_BUILD=OFF ' +
+                        '-DWITH_SYSTEMD=OFF',
                     extra_cmds=[
                         '../contrib/ci/drone-check-static-libs.sh',
                         '../contrib/ci/drone-static-upload.sh'