Skip to content

Commit 2086570

Browse files
authored
webOS: use STAGING_DIR, not SDK_PATH (#18958)
1 parent 0f247ad commit 2086570

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

gfx/common/wayland/generate_wayland_protos.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ done
3333
WAYSCAN="$(exists wayland-scanner || :)"
3434

3535
if [ -n "${CROSS_COMPILE:-}" ] && echo "${CROSS_COMPILE:-}" | grep -q "webos"; then
36-
if [ -z "${SDK_PATH:-}" ]; then
37-
die 1 "Error: WEBOS=1 but SDK_PATH not set"
36+
if [ -z "${STAGING_DIR:-}" ]; then
37+
die 1 "Error: WEBOS=1 but STAGING_DIR not set"
3838
fi
39-
WAYSCAN="$SDK_PATH/bin/wayland-scanner"
39+
WAYSCAN="$STAGING_DIR/../../bin/wayland-scanner"
4040
fi
4141

4242
PKGCONFIG="$(exists pkg-config || :)"
@@ -84,10 +84,10 @@ generate_source 'staging/single-pixel-buffer' 'single-pixel-buffer-v1'
8484
generate_source 'staging/xdg-toplevel-icon' 'xdg-toplevel-icon-v1'
8585

8686
if [ -n "${CROSS_COMPILE:-}" ] && echo "${CROSS_COMPILE:-}" | grep -q "webos"; then
87-
if [ -z "${SDK_PATH:-}" ]; then
88-
die 1 "Error: WEBOS=1 but SDK_PATH not set"
87+
if [ -z "${STAGING_DIR:-}" ]; then
88+
die 1 "Error: WEBOS=1 but STAGING_DIR not set"
8989
fi
90-
WAYLAND_PROTOS="$SDK_PATH/arm-webos-linux-gnueabi/sysroot/usr/share"
90+
WAYLAND_PROTOS="$STAGING_DIR/usr/share"
9191

9292
generate_source 'wayland-webos' 'webos-shell'
9393
generate_source 'wayland-webos' 'webos-foreign'

0 commit comments

Comments
 (0)