diff options
| -rw-r--r-- | .github/workflows/haiku.yml | 4 | ||||
| -rw-r--r-- | xmake/core/base/os.lua | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.github/workflows/haiku.yml b/.github/workflows/haiku.yml index c872b678e..34e51392b 100644 --- a/.github/workflows/haiku.yml +++ b/.github/workflows/haiku.yml @@ -48,8 +48,8 @@ jobs: RUN_PROBABILITY: ${{ vars.HAIKU_RUN_PROBABILITY || '0.2' }} build: - #needs: check - #if: needs.check.outputs.should-run == 'true' + needs: check + if: needs.check.outputs.should-run == 'true' runs-on: ubuntu-latest concurrency: diff --git a/xmake/core/base/os.lua b/xmake/core/base/os.lua index b8ce09f68..1766d28f5 100644 --- a/xmake/core/base/os.lua +++ b/xmake/core/base/os.lua @@ -202,6 +202,12 @@ end -- if tmpdir_root is a symbolic link, os.tmpdir() may return a path that differs -- from the path style returned by os.curdir() (e.g. on Haiku). +-- +-- Using a consistent root path can avoid errors in relative path resolution. +-- +-- e.g. +-- tmpdir: /tmp/.xmake0/260217/ -> /boot/system/cache/tmp/.xmake0/260217 +-- curdir: /boot/system/cache/tmp/.xmake0/260217 function os._resolve_tmpdir(tmpdir_root) if os.islink(tmpdir_root) then tmpdir_root = os.readlink(tmpdir_root) or tmpdir_root |