From 8d9982e30d7927cd1293e23117b669ef7d296969 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 22 Jun 2020 12:13:20 +0900 Subject: [PATCH 1/2] network: drop unnecessary "&" This confuses gcc-10 with -O3 -flto. Closes #16224. --- src/network/networkd-dhcp6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index f0766f0af7..27b74407af 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -1065,7 +1065,7 @@ static int dhcp6_assign_delegated_prefix(Link *link, address->in_addr.in6 = *prefix; if (!in_addr_is_null(AF_INET6, &link->network->dhcp6_delegation_prefix_token)) - memcpy(&address->in_addr.in6.s6_addr + 8, &link->network->dhcp6_delegation_prefix_token.in6.s6_addr + 8, 8); + memcpy(address->in_addr.in6.s6_addr + 8, link->network->dhcp6_delegation_prefix_token.in6.s6_addr + 8, 8); else { r = generate_ipv6_eui_64_address(link, &address->in_addr.in6); if (r < 0) From e6175fbe451399fa86b9c1ecd56474d9696f8315 Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sat, 20 Jun 2020 00:44:09 +0200 Subject: [PATCH 2/2] ci: pass -Werror using CFLAGS Judging by https://github.com/systemd/systemd/issues/16224, it seems `--werror` doesn't work with `-Db_lto=true` --- .github/workflows/ubuntu-build-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu-build-check.sh b/.github/workflows/ubuntu-build-check.sh index fb7c71ecb8..75fc36fffb 100755 --- a/.github/workflows/ubuntu-build-check.sh +++ b/.github/workflows/ubuntu-build-check.sh @@ -102,7 +102,7 @@ for args in "${ARGS[@]}"; do SECONDS=0 info "Checking build with $args" - if ! AR="$AR" CC="$CC" CXX="$CXX" meson -Dtests=unsafe -Dslow-tests=true --werror $args build; then + if ! AR="$AR" CC="$CC" CXX="$CXX" CFLAGS="-Werror" CXXFLAGS="-Werror" meson -Dtests=unsafe -Dslow-tests=true --werror $args build; then fatal "meson failed with $args" fi