From 33b39ccf64fa42206f55b9eaf3d66aca33b2f80b Mon Sep 17 00:00:00 2001 From: Brainos Date: Thu, 18 May 2023 00:16:51 +0800 Subject: [PATCH 1/4] Upgrade llvm to 16. --- prepare.sh | 2 +- renpybuild/run.py | 4 ++-- tasks/renios.py | 2 +- tasks/toolchain.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/prepare.sh b/prepare.sh index bbe9b81c..142f4521 100755 --- a/prepare.sh +++ b/prepare.sh @@ -45,7 +45,7 @@ mkdir -p $ROOT/tmp # Clang is needed to compile for many platforms. wget -O tmp/llvm.sh https://apt.llvm.org/llvm.sh chmod +x tmp/llvm.sh -sudo tmp/llvm.sh 15 +sudo tmp/llvm.sh 16 # Install the programs and virtualenvs. diff --git a/renpybuild/run.py b/renpybuild/run.py index 5f40debb..0e3e54b6 100644 --- a/renpybuild/run.py +++ b/renpybuild/run.py @@ -37,7 +37,7 @@ def emsdk_environment(c): c.env(k, v) -def llvm(c, bin="", prefix="", suffix="-15", clang_args="", use_ld=True): +def llvm(c, bin="", prefix="", suffix="-16", clang_args="", use_ld=True): if bin and not bin.endswith("/"): bin += "/" @@ -177,7 +177,7 @@ def build_environment(c): elif (c.platform == "ios") and (c.arch == "sim-x86_64"): c.env("IPHONEOS_DEPLOYMENT_TARGET", "13.0") - c.var("lipo", "llvm-lipo-15") + c.var("lipo", "llvm-lipo-16") if c.kind == "host" or c.kind == "host-python" or c.kind == "cross": diff --git a/tasks/renios.py b/tasks/renios.py index 1d97fb4f..b90cbd66 100644 --- a/tasks/renios.py +++ b/tasks/renios.py @@ -24,7 +24,7 @@ def check_sdk(name, paths): for d in paths: fn = d / name - p = subprocess.run([ "llvm-otool-15", "-l", f"{fn}"], capture_output=True) + p = subprocess.run([ "llvm-otool-16", "-l", f"{fn}"], capture_output=True) obj = None diff --git a/tasks/toolchain.py b/tasks/toolchain.py index bfee40f6..2d7346a7 100644 --- a/tasks/toolchain.py +++ b/tasks/toolchain.py @@ -8,8 +8,8 @@ @task(kind="cross", platforms="windows") def download(c: Context): - url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz" - dest = c.path("{{ tmp }}/tars/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz") + url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230504/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz" + dest = c.path("{{ tmp }}/tars/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz") if os.path.exists(dest): return @@ -33,8 +33,8 @@ def unpack(c: Context): c.clean("{{cross}}") c.chdir("{{cross}}") - c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64.tar.xz") - c.run("ln -s llvm-mingw-20220906-ucrt-ubuntu-18.04-x86_64 llvm-mingw") + c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz") + c.run("ln -s llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64 llvm-mingw") @task(kind="cross", platforms="android", always=True) From e0bf92b8e9ddd93c13dfd7f4dc36c94b2cfa7fb9 Mon Sep 17 00:00:00 2001 From: Brainos Date: Mon, 22 May 2023 13:26:05 +0800 Subject: [PATCH 2/4] Upgrade to 16.0.4. --- tasks/toolchain.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/toolchain.py b/tasks/toolchain.py index 2d7346a7..f3971e7b 100644 --- a/tasks/toolchain.py +++ b/tasks/toolchain.py @@ -8,8 +8,8 @@ @task(kind="cross", platforms="windows") def download(c: Context): - url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230504/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz" - dest = c.path("{{ tmp }}/tars/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz") + url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230517/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz" + dest = c.path("{{ tmp }}/tars/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz") if os.path.exists(dest): return @@ -33,8 +33,8 @@ def unpack(c: Context): c.clean("{{cross}}") c.chdir("{{cross}}") - c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64.tar.xz") - c.run("ln -s llvm-mingw-20230504-ucrt-ubuntu-20.04-x86_64 llvm-mingw") + c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz") + c.run("ln -s llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64 llvm-mingw") @task(kind="cross", platforms="android", always=True) From aa29cbb83f0c7cfbab7e55e6e5193d9e19c4aa18 Mon Sep 17 00:00:00 2001 From: Brainos Date: Wed, 7 Jun 2023 22:08:11 +0800 Subject: [PATCH 3/4] toolchain: upgrade llvm to 16.0.5 --- tasks/toolchain.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/toolchain.py b/tasks/toolchain.py index f3971e7b..01b3e403 100644 --- a/tasks/toolchain.py +++ b/tasks/toolchain.py @@ -8,8 +8,8 @@ @task(kind="cross", platforms="windows") def download(c: Context): - url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230517/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz" - dest = c.path("{{ tmp }}/tars/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz") + url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230603/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz" + dest = c.path("{{ tmp }}/tars/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz") if os.path.exists(dest): return @@ -33,8 +33,8 @@ def unpack(c: Context): c.clean("{{cross}}") c.chdir("{{cross}}") - c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64.tar.xz") - c.run("ln -s llvm-mingw-20230517-ucrt-ubuntu-20.04-x86_64 llvm-mingw") + c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz") + c.run("ln -s llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64 llvm-mingw") @task(kind="cross", platforms="android", always=True) From e681f9f43161d385b1fe9023b4eca1a87d973271 Mon Sep 17 00:00:00 2001 From: Brainos Date: Mon, 26 Jun 2023 10:51:26 +0800 Subject: [PATCH 4/4] Upgrade llvm-mingw to 16.0.6 --- tasks/toolchain.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks/toolchain.py b/tasks/toolchain.py index 01b3e403..c2daf902 100644 --- a/tasks/toolchain.py +++ b/tasks/toolchain.py @@ -8,8 +8,8 @@ @task(kind="cross", platforms="windows") def download(c: Context): - url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230603/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz" - dest = c.path("{{ tmp }}/tars/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz") + url = "https://github.com/mstorsjo/llvm-mingw/releases/download/20230614/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz" + dest = c.path("{{ tmp }}/tars/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz") if os.path.exists(dest): return @@ -33,8 +33,8 @@ def unpack(c: Context): c.clean("{{cross}}") c.chdir("{{cross}}") - c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64.tar.xz") - c.run("ln -s llvm-mingw-20230603-ucrt-ubuntu-20.04-x86_64 llvm-mingw") + c.run("tar xaf {{ tmp }}/tars/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz") + c.run("ln -s llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64 llvm-mingw") @task(kind="cross", platforms="android", always=True)