Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade LLVM to 16 #68

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+8 −8
Draft

Upgrade LLVM to 16 #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33b39cc
Upgrade llvm to 16.
brainos233 May 17, 2023
e0bf92b
Upgrade to 16.0.4.
brainos233 May 22, 2023
aa29cbb
toolchain: upgrade llvm to 16.0.5
brainos233 Jun 7, 2023
e681f9f
Upgrade llvm-mingw to 16.0.6
brainos233 Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions renpybuild/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += "/"
Expand Down Expand Up @@ -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":
Expand Down
2 changes: 1 addition & 1 deletion tasks/renios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions tasks/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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
Expand All @@ -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-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)
Expand Down