Skip to content

Commit f23c3d6

Browse files
smaslov-intelPavel Chupin
andauthored
Revert "[SYCL] disable sccache for ze_loader build" and define USE_Z7 instead (#7848)
Reverts #7839 --------- Co-authored-by: Pavel Chupin <[email protected]>
1 parent 589824d commit f23c3d6

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

sycl/plugins/level_zero/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
1616
GIT_TAG ${LEVEL_ZERO_LOADER_TAG}
1717
)
1818

19-
# sccache is not compatible with /Zi flag, disable sccache
20-
set(CMAKE_CXX_COMPILER_LAUNCHER_BAK "${CMAKE_CXX_COMPILER_LAUNCHER}")
21-
set(CMAKE_CXX_COMPILER_LAUNCHER "")
22-
2319
# Workaround warnings/errors for Level Zero build
2420
set(CMAKE_CXX_FLAGS_BAK "${CMAKE_CXX_FLAGS}")
2521
if (WIN32)
26-
#FIXME: Level Zero build fails with /DUNICODE
22+
# FIXME: Level Zero build fails with /DUNICODE
2723
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /UUNICODE")
24+
# USE_Z7 forces use of /Z7 instead of /Zi which is broken with sccache
25+
set(USE_Z7 ON)
2826
else()
2927
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
3028
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pedantic")
@@ -39,7 +37,6 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
3937

4038
# Restore original flags
4139
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
42-
set(CMAKE_CXX_COMPILER_LAUNCHER "${CMAKE_CXX_COMPILER_LAUNCHER_BAK}")
4340

4441
set(LEVEL_ZERO_LIBRARY ze_loader)
4542
set(LEVEL_ZERO_INCLUDE_DIR

0 commit comments

Comments
 (0)