diff options
| author | Ilya Maximets <i.maximets@ovn.org> | 2022-12-22 01:06:18 +0100 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2023-01-03 12:43:16 +0100 |
| commit | 46b3a2c68d40a7aa66fa4a60850a70ef376e32bb (patch) | |
| tree | 89aa76f859f99994a683e37cfa077ac7d2a34603 | |
| parent | 055a2a0f9dfc13188279c3207ba953328677e7ff (diff) | |
| download | openvswitch-46b3a2c68d40a7aa66fa4a60850a70ef376e32bb.tar.gz | |
ci: Fix overriding OPTS provided from the yml.
For GCC builds we're overriding --disable-ssl or --enable-shared
options set up in the GHA yml file.
Fix that by adding to EXTRA_OPTS instead.
Fixes: 2581b0ad1159 ("travis: Combine kernel builds.")
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rwxr-xr-x | .ci/linux-build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index ed5fbbb05..306cffecd 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -218,7 +218,7 @@ elif [ "$M32" ]; then # difference on 'configure' and 'make' stages. export CC="$CC -m32" elif [ "$TRAVIS_ARCH" != "aarch64" ]; then - OPTS="--enable-sparse" + EXTRA_OPTS="$EXTRA_OPTS --enable-sparse" if [ "$AFXDP" ]; then # netdev-afxdp uses memset for 64M for umem initialization. SPARSE_FLAGS="${SPARSE_FLAGS} -Wno-memcpy-max-count" |