diff --git a/autobuild.sh b/autobuild.sh index e96f7692a..ae6bf0a68 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -45,9 +45,9 @@ function ocf_precompile() { # So we precompile OCF now for further use as standalone static library ./configure $(echo $config_params | sed 's/--enable-coverage//g') $MAKE $MAKEFLAGS include/spdk/config.h - CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/build/ocf.a + CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/ocf.a # Set config to use precompiled library - config_params="$config_params --with-ocf=/$rootdir/build/ocf.a" + config_params="$config_params --with-ocf=/$rootdir/ocf.a" # need to reconfigure to avoid clearing ocf related files on future make clean. ./configure $config_params } diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 759a244a3..0fea70e68 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -90,8 +90,8 @@ function install_refspdk() { $output_dir/configure $(echo $config_params | sed 's/--enable-coverage//g') if [[ $OSID != freebsd ]]; then $MAKE -C $output_dir $MAKEFLAGS include/spdk/config.h - CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/build/ocf.a - $output_dir/configure $config_params --with-ocf=$output_dir/build/ocf.a --with-shared + CONFIG_OCF_PATH="$output_dir/ocf" $MAKE -C $output_dir/lib/env_ocf $MAKEFLAGS exportlib O=$output_dir/ocf.a + $output_dir/configure $config_params --with-ocf=$output_dir/ocf.a --with-shared fi $MAKE -C $output_dir $MAKEFLAGS ) diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index b56a810e6..30f5a0edc 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -243,7 +243,7 @@ function confirm_makefile_deps() { config_params=$(get_config_params) if [ "$SPDK_TEST_OCF" -eq 1 ]; then - config_params="$config_params --with-ocf=$rootdir/build/ocf.a" + config_params="$config_params --with-ocf=$rootdir/ocf.a" fi $MAKE $MAKEFLAGS clean