devtools: fix build test config inheritance from env

[dpdk.git] / devtools / test-meson-builds.sh

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 0c95d1c..f32b578 100755 (executable)
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -38,10 +38,10 @@ else
 fi
 
 default_path=$PATH
-default_pkgpath=$PKG_CONFIG_PATH
 default_cppflags=$CPPFLAGS
 default_cflags=$CFLAGS
 default_ldflags=$LDFLAGS
+default_meson_options=$DPDK_MESON_OPTIONS
 
 check_cc_flags () # <flag to check> <flag2> ...
 {
@@ -52,12 +52,14 @@ check_cc_flags () # <flag to check> <flag2> ...
 load_env () # <target compiler>
 {
        targetcc=$1
+       # reset variables before target-specific config
        export PATH=$default_path
-       export PKG_CONFIG_PATH=$default_pkgpath
+       unset PKG_CONFIG_PATH # global default makes no sense
        export CPPFLAGS=$default_cppflags
        export CFLAGS=$default_cflags
        export LDFLAGS=$default_ldflags
-       unset DPDK_MESON_OPTIONS
+       export DPDK_MESON_OPTIONS=$default_meson_options
+       # set target hint for use in the loaded config file
        if [ -n "$target_override" ] ; then
                DPDK_TARGET=$target_override
        elif command -v $targetcc >/dev/null 2>&1 ; then