diff options
| author | Dan Engelbrecht <[email protected]> | 2024-10-10 09:41:30 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2024-10-10 09:41:30 +0200 |
| commit | d0c691be85e26399caaf7c3fa4071d56fe4255c5 (patch) | |
| tree | c0510b50ba9cb86209d2d4d929392a6f9dff407b | |
| parent | don't read chunks into memory during cache batch fetch unless we may cache th... (diff) | |
| download | zen-d0c691be85e26399caaf7c3fa4071d56fe4255c5.tar.xz zen-d0c691be85e26399caaf7c3fa4071d56fe4255c5.zip | |
Revert "remove temporary workaround involving _LIBCPP_DISABLE_AVAILABILITY (#191)" (#193)
This reverts commit e809931618b443809e9740edb70a62d0cab01f87.
| -rw-r--r-- | .github/workflows/validate.yml | 3 | ||||
| -rw-r--r-- | xmake.lua | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 99f2a4f8e..7487297f4 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -234,9 +234,8 @@ jobs: name: reports-macos path: build/reports/*.xml - # signing temporarily disabled due to runner issues - name: Bundle - if: ${{ matrix.config == 'release' && 1 == 2 }} + if: ${{ matrix.config == 'release' }} run: | xmake bundle -v -y --codesignidentity="Developer ID Application" env: @@ -93,6 +93,12 @@ if is_os("windows") then -- add_ldflags("/MAP") end +if is_os("macosx") then + -- temporary workaround for xcode 12.1 (UE minimum spec is 12.5) + -- TODO: once CI is updated we should remove this + add_defines("_LIBCPP_DISABLE_AVAILABILITY") +end + if is_os("linux") or is_os("macosx") then add_cxxflags("-Wno-implicit-fallthrough") add_cxxflags("-Wno-missing-field-initializers") |