summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Maximets <i.maximets@ovn.org>2022-12-22 01:06:18 +0100
committerIlya Maximets <i.maximets@ovn.org>2023-01-03 12:44:33 +0100
commit57c76329eff998124a13c7835dfebd4e8d99013f (patch)
tree05ad8583724d8cdff88da9c25cb74418499e369f
parent27987cf63ed97ba3fc7e2a241afe1983d38aa891 (diff)
downloadopenvswitch-57c76329eff998124a13c7835dfebd4e8d99013f.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.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 776148cfd..c1db40519 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -199,7 +199,7 @@ elif [ "$M32" ]; then
# difference on 'configure' and 'make' stages.
export CC="$CC -m32"
else
- 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"