switch to LLVM 14

and adapt to Makefile variable renaming.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/control b/debian/control
index 0f7022e9c1364dd859bdea9dd3303134c34c6548..c2a637392ed1ffd9bd0de8fa25cafe3bd4dd952b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Uploaders: Ximin Luo <infinity0@debian.org>
-Build-Depends: debhelper-compat (= 12), clang-13, llvm-13
+Build-Depends: debhelper-compat (= 12), clang-14, llvm-14
 Standards-Version: 4.4.1
 Homepage: https://github.com/CraneStation/wasi-libc
 Vcs-Browser: https://salsa.debian.org/rust-team/wasi-libc

diff --git a/debian/rules b/debian/rules
index 01b8a3db5883f51f3f5c361d6ff0f6de61db9818..7e83d5db539e18c8023fdd5f804165bbeb32b338 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,13 +5,13 @@
 
 include /usr/share/dpkg/buildflags.mk
 
-export WASM_NM = llvm-nm-13
-export WASM_AR = llvm-ar-13
-export WASM_CC = clang-13
+export NM = llvm-nm-14
+export AR = llvm-ar-14
+export CC = clang-14
 
 # stack protector not yet supported, see
 # https://github.com/CraneStation/wasi-libc/issues/157
-export WASM_CFLAGS = $(CFLAGS) $(LDFLAGS) -fno-stack-protector
+export EXTRA_CFLAGS = $(CFLAGS) $(LDFLAGS) -fno-stack-protector
 
 %:
        dh $@