Skip to content

Commit 201e382

Browse files
committed
test
Signed-off-by: Sarnie, Nick <[email protected]>
1 parent a73725c commit 201e382

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

.github/workflows/sycl-windows-build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
uses: ./src/devops/actions/setup_windows_oneapi_env
8787
if: ${{ always() && !cancelled() && inputs.compiler == 'icx' }}
8888
- name: Set env
89-
run: |
89+
run: |
9090
git config --system core.longpaths true
9191
git config --global core.autocrlf false
9292
echo "C:\Program Files\Git\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -116,7 +116,7 @@ jobs:
116116
- name: Build
117117
id: build
118118
shell: bash
119-
run: |
119+
run: |
120120
cmake --build build --target sycl-toolchain
121121
- name: check-llvm
122122
if: always() && !cancelled() && contains(inputs.changes, 'llvm')
@@ -156,6 +156,7 @@ jobs:
156156
cmake --build build --target check-libdevice
157157
- name: Install
158158
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
159+
shell: bash
159160
# TODO replace utility installation with a single CMake target
160161
run: |
161162
cmake --build build --target deploy-sycl-toolchain
@@ -174,6 +175,7 @@ jobs:
174175
tar -czf ${{ inputs.artifact_archive_name }} -C install .
175176
- name: Upload toolchain
176177
if: ${{ always() && !cancelled() && steps.build.conclusion == 'success' }}
178+
shell: bash
177179
uses: actions/upload-artifact@v4
178180
with:
179181
name: sycl_windows_default

devops/actions/setup_windows_oneapi_env/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ runs:
2525
Add-Content -Path $githubEnvFilePath -Value "$name=$value"
2626
}
2727
}
28-
}
28+
}

sycl/source/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ function(add_sycl_rt_library LIB_NAME LIB_OBJ_NAME)
223223
-Winstantiation-after-specialization)
224224
endif()
225225

226+
# When building using icx on Windows, the VERSION file
227+
# produced by cmake is used in source code
228+
# when including '<version>' because Windows is
229+
# case-insensitive and icx adds the build directory
230+
# to the system header search path.
226231
if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "IntelLLVM")
227232
set(VERSION_FILE "${CMAKE_BINARY_DIR}/VERSION")
228233
if(EXISTS ${VERSION_FILE})

0 commit comments

Comments
 (0)