From 224c079107ffbc5c40d05571f8b81b70f89bfe8b Mon Sep 17 00:00:00 2001 From: Anton Volkov Date: Wed, 14 Jun 2023 03:07:46 -0500 Subject: [PATCH] Workaround to Klocwork --- conda-recipe/bld.bat | 2 +- conda-recipe/build.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 9398b115175b..8b2e1927f7ff 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -18,7 +18,7 @@ set "DPL_ROOT_HINT=%PREFIX%/Library" %PYTHON% -m dpctl --cmakedir > Output set /p DPCTL_CMAKE_DIR= < Output -set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx" +set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" set "SKBUILD_ARGS=%SKBUILD_ARGS% -DDPCTL_MODULE_PATH:PATH=%DPCTL_CMAKE_DIR% " set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 8d832e5cb96c..09aa09734462 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -1,5 +1,11 @@ #!/bin/bash +# Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified +# by DPC++ compiler conda packages. Will need to be added to DPC++ compiler +# activation scripts. +export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib" + # Intel LLVM must cooperate with compiler and sysroot from conda echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg export ICPXCFG="$(pwd)/icpx_for_conda.cfg" @@ -10,7 +16,7 @@ export TBB_ROOT_HINT=$PREFIX export DPL_ROOT_HINT=$PREFIX export MKL_ROOT_HINT=$PREFIX SKBUILD_ARGS="-- -DDPCTL_MODULE_PATH=$($PYTHON -m dpctl --cmakedir) " -SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx" +SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" # Build wheel package