Skip to content

Commit

Permalink
Merge pull request #305 from pmienk/master
Browse files Browse the repository at this point in the history
Bump clang to version 15 due to incompatibility with libstdc++.
  • Loading branch information
evoskuil authored Jan 29, 2024
2 parents b1925f3 + 118db83 commit efa58dd
Showing 1 changed file with 16 additions and 27 deletions.
43 changes: 16 additions & 27 deletions generate4.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
<!-- image="xcode12.2" equivalent? -->
<!-- prefix variance? -->
<job build="all"
system="osx" version="14"
system="osx"
assert="ndebug"
link="dynamic"
optimization="size">
Expand All @@ -191,7 +191,7 @@
</job>

<job build="all"
system="osx" version="14"
system="osx"
assert="ndebug"
link="static"
optimization="size">
Expand All @@ -202,7 +202,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug"
link="dynamic"
optimization="size"
Expand All @@ -214,7 +214,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug"
link="static"
optimization="size"
Expand Down Expand Up @@ -586,7 +586,6 @@
<!-- prefix variance? -->
<job build="all"
system="osx"
version="14"
assert="ndebug" link="dynamic" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="with" />
Expand All @@ -595,7 +594,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -604,7 +602,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared-without_icu">
<axis name="boost" value="build" />
Expand All @@ -616,7 +614,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size-with_icu">
<axis name="boost" value="build" />
Expand Down Expand Up @@ -872,7 +870,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -881,7 +878,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared">
<axis name="boost" value="build" />
Expand All @@ -891,7 +888,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size">
<axis name="boost" value="build" />
Expand Down Expand Up @@ -1112,7 +1109,6 @@
<!-- prefix variance? -->
<job build="all"
system="osx"
version="14"
assert="ndebug" link="dynamic" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="with" />
Expand All @@ -1122,7 +1118,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -1132,7 +1127,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared">
<axis name="boost" value="build" />
Expand All @@ -1143,7 +1138,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size">
<axis name="boost" value="build" />
Expand Down Expand Up @@ -1752,7 +1747,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="dynamic" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -1761,7 +1755,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -1770,7 +1763,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared">
<axis name="boost" value="build" />
Expand All @@ -1780,7 +1773,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size">
<!-- version="5.0" -->
Expand Down Expand Up @@ -2000,7 +1993,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="dynamic" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -2010,7 +2002,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -2020,7 +2011,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared-with_consensus">
<axis name="boost" value="build" />
Expand All @@ -2031,7 +2022,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size-with_consensus">
<!-- version="5.0" -->
Expand Down Expand Up @@ -2258,7 +2249,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="dynamic" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -2268,7 +2258,6 @@

<job build="all"
system="osx"
version="14"
assert="ndebug" link="static" optimization="size">
<axis name="boost" value="build" />
<axis name="icu" value="build" />
Expand All @@ -2278,7 +2267,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="debug" link="dynamic" optimization="size"
preset="nix-gnu-debug-shared">
<axis name="boost" value="build" />
Expand All @@ -2289,7 +2278,7 @@

<job build="all"
system="linux" image="ubuntu-22.04"
compiler="clang" version="14"
compiler="clang" version="15"
assert="ndebug" link="static" optimization="size"
preset="nix-gnu-release-static-size">
<axis name="boost" value="build" />
Expand Down

0 comments on commit efa58dd

Please sign in to comment.