Bump emscripten and clang versions
This commit is contained in:
Родитель
4ae710c1fb
Коммит
34aa1bfe58
|
@ -6,7 +6,7 @@
|
|||
<VersionPrefix>8.0.0</VersionPrefix>
|
||||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
<PreReleaseVersionIteration>4</PreReleaseVersionIteration>
|
||||
<EmscriptenVersion>3.1.30</EmscriptenVersion>
|
||||
<EmscriptenVersion>3.1.34</EmscriptenVersion>
|
||||
<EmscriptenVersionNet6>2.0.23</EmscriptenVersionNet6>
|
||||
<EmscriptenVersionNet7>3.1.12</EmscriptenVersionNet7>
|
||||
<PackageVersionNet7>7.0.3</PackageVersionNet7>
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
#
|
||||
# This abomination of a script is meant to replace the symlinks
|
||||
# pointing to the clang-16 binary and set the appropriate flags
|
||||
# to avoid duplicating the 90MB clang-16 binary inside the nuget
|
||||
# pointing to the clang-17 binary and set the appropriate flags
|
||||
# to avoid duplicating the 90MB clang-17 binary inside the nuget
|
||||
# package.
|
||||
#
|
||||
CLANG_NAME=$(basename "$0")
|
||||
CLANG_CC=$(dirname $0)/clang-16
|
||||
CLANG_CC=$(dirname $0)/clang-17
|
||||
|
||||
EXTRA_ARGS=""
|
||||
case $CLANG_NAME in
|
||||
|
|
|
@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
|
|||
# Set default versions
|
||||
if [ -z "$majorVersion" ]; then
|
||||
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
|
||||
if [ "$compiler" = "clang" ]; then versions="16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
|
||||
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
|
||||
elif [ "$compiler" = "gcc" ]; then versions="12 11 10 9 8 7 6 5 4.9"; fi
|
||||
|
||||
for version in $versions; do
|
||||
|
|
|
@ -43,9 +43,9 @@
|
|||
|
||||
<Exec WorkingDirectory="$(RepoRoot)"
|
||||
Command="$(PythonFileName) eng/sanitize.py $(RepoRoot)" />
|
||||
<!-- clang-wrapper.sh hardcodes clang-16 at the moment so make sure it still exists -->
|
||||
<!-- clang-wrapper.sh hardcodes clang-17 at the moment so make sure it still exists -->
|
||||
<Error Text="Update clang-wrapper.sh to point at the correct clang-* version"
|
||||
Condition="!Exists('$(UpstreamDirectory)\bin\clang-16') and !$([MSBuild]::IsOSPlatform(Windows))" />
|
||||
Condition="!Exists('$(UpstreamDirectory)\bin\clang-17') and !$([MSBuild]::IsOSPlatform(Windows))" />
|
||||
<Delete Files="$(UpstreamDirectory)\bin\clang"
|
||||
Condition="!$([MSBuild]::IsOSPlatform(Windows))" />
|
||||
<Delete Files="$(UpstreamDirectory)\bin\binaryen-unittests"
|
||||
|
|
Загрузка…
Ссылка в новой задаче