Skip to content

Commit 222dd3d

Browse files
authored
Merge pull request #1084 from lukaszstolarczuk/fix-icx-build
Fix icx build
2 parents 8be5147 + 9ff9452 commit 222dd3d

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ jobs:
179179
- name: Run tests
180180
working-directory: ${{env.BUILD_DIR}}
181181
run: |
182-
LD_LIBRARY_PATH=${{env.BUILD_DIR}}/lib/ ctest --output-on-failure # run all tests for better coverage
182+
${{ matrix.compiler.cxx == 'icpx' && '. /opt/intel/oneapi/setvars.sh' || true }}
183+
LD_LIBRARY_PATH="${{env.BUILD_DIR}}/lib/:${LD_LIBRARY_PATH}" ctest --output-on-failure
183184
184185
- name: Check coverage
185186
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}

cmake/helpers.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,6 @@ function(add_umf_library)
378378
elseif(LINUX)
379379
target_link_options(${ARG_NAME} PRIVATE
380380
"-Wl,--version-script=${ARG_LINUX_MAP_FILE}")
381-
if(CMAKE_C_COMPILER_ID STREQUAL "IntelLLVM")
382-
target_link_options(${ARG_NAME} PRIVATE -no-intel-lib)
383-
endif()
384381
endif()
385382
endif()
386383

0 commit comments

Comments
 (0)