Skip to content

Commit 2b4f173

Browse files
committed
Workaround to Klocwork (#1433)
1 parent 7eb3760 commit 2b4f173

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set "DPL_ROOT_HINT=%PREFIX%/Library"
1818
%PYTHON% -m dpctl --cmakedir > Output
1919
set /p DPCTL_CMAKE_DIR= < Output
2020

21-
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx"
21+
set "SKBUILD_ARGS=-G Ninja -- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
2222
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DDPCTL_MODULE_PATH:PATH=%DPCTL_CMAKE_DIR% "
2323
set "SKBUILD_ARGS=%SKBUILD_ARGS% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
2424

conda-recipe/build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
#!/bin/bash
22

3+
# Workaround to Klocwork overwriting LD_LIBRARY_PATH that was modified
4+
# by DPC++ compiler conda packages. Will need to be added to DPC++ compiler
5+
# activation scripts.
6+
export LDFLAGS="$LDFLAGS -Wl,-rpath,$PREFIX/lib"
7+
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PREFIX/compiler/lib/intel64_lin:$PREFIX/compiler/lib:$PREFIX/lib"
8+
39
# Intel LLVM must cooperate with compiler and sysroot from conda
410
echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icpx_for_conda.cfg
511
export ICPXCFG="$(pwd)/icpx_for_conda.cfg"
@@ -10,7 +16,7 @@ export TBB_ROOT_HINT=$PREFIX
1016
export DPL_ROOT_HINT=$PREFIX
1117
export MKL_ROOT_HINT=$PREFIX
1218
SKBUILD_ARGS="-- -DDPCTL_MODULE_PATH=$($PYTHON -m dpctl --cmakedir) "
13-
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx"
19+
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_CXX_COMPILER:PATH=icpx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1420
SKBUILD_ARGS="${SKBUILD_ARGS} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"
1521

1622
# Build wheel package

0 commit comments

Comments
 (0)