Skip to content

Commit da37661

Browse files
committed
chore: Rename WASI_SDK_ROOT to WASI_SDK_PATH
WASI_SDK_PATH shows up a lot more in projects using the WASI SDK.
1 parent 104a286 commit da37661

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.devcontainer/features/wasi-sdk/devcontainer-feature.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"ghcr.io/devcontainers/features/common-utils": {}
77
},
88
"containerEnv": {
9-
"WASI_SDK_ROOT": "/opt/wasi-sdk"
9+
"WASI_SDK_PATH": "/opt/wasi-sdk"
1010
}
1111
}

CMakePresets.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"binaryDir": "${sourceDir}/build.wasi",
5151
"cacheVariables": {
5252
"CMAKE_EXPORT_COMPILE_COMMANDS": "YES",
53-
"CMAKE_TOOLCHAIN_FILE": "$env{WASI_SDK_ROOT}/share/cmake/wasi-sdk.cmake",
53+
"CMAKE_TOOLCHAIN_FILE": "$env{WASI_SDK_PATH}/share/cmake/wasi-sdk.cmake",
5454
"CMAKE_BUILD_TYPE": "Release",
5555
"CMAKE_INSTALL_PREFIX": "${sourceDir}/build.wasi/install/usr",
5656
"CMAKE_INTERPROCEDURAL_OPTIMIZATION": "YES",
@@ -59,7 +59,7 @@
5959
},
6060
"condition": {
6161
"type": "notEquals",
62-
"lhs": "$env{WASI_SDK_ROOT}",
62+
"lhs": "$env{WASI_SDK_PATH}",
6363
"rhs": ""
6464
}
6565
}
@@ -76,7 +76,9 @@
7676
{
7777
"name": "install",
7878
"configurePreset": "default",
79-
"targets": ["install"]
79+
"targets": [
80+
"install"
81+
]
8082
},
8183
{
8284
"name": "build-emscripten",
@@ -85,7 +87,9 @@
8587
{
8688
"name": "install-emscripten",
8789
"configurePreset": "emscripten",
88-
"targets": ["install"]
90+
"targets": [
91+
"install"
92+
]
8993
},
9094
{
9195
"name": "build-wasi",
@@ -94,7 +98,9 @@
9498
{
9599
"name": "install-wasi",
96100
"configurePreset": "wasi",
97-
"targets": ["install"]
101+
"targets": [
102+
"install"
103+
]
98104
}
99105
],
100106
"testPresets": [
@@ -168,4 +174,4 @@
168174
]
169175
}
170176
]
171-
}
177+
}

0 commit comments

Comments
 (0)