diff --git a/install-k b/install-k index b0e3177d14c..98e54d6eb71 100755 --- a/install-k +++ b/install-k @@ -1,6 +1,6 @@ #!/bin/sh -e -K_VERSION=5.4.3 +K_VERSION=5.4.4 if [ `id -u` -ne 0 ]; then echo "$0: error: This script must be run as root." diff --git a/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java b/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java index 000712a126b..c8d25acd947 100644 --- a/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java +++ b/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java @@ -108,10 +108,14 @@ public void accept(Backend.Holder h) { private void llvmKompile(String type, String executable) { ProcessBuilder pb = files.getProcessBuilder(); List args = new ArrayList<>(); - args.add("llvm-kompile"); + args.add("llvm-kompilex"); args.add("definition.kore"); args.add("dt"); args.add(type); + + // Arguments after this point are passed on to Clang. + args.add("--"); + args.add("-o"); args.add(executable); if (kompileOptions.optimize1) args.add("-O1"); @@ -128,10 +132,10 @@ private void llvmKompile(String type, String executable) { Process p = pb.command(args).directory(kompiledDir).inheritIO().start(); int exit = p.waitFor(); if (exit != 0) { - throw KEMException.criticalError("llvm-kompile returned nonzero exit code: " + exit + "\nExamine output to see errors."); + throw KEMException.criticalError("llvm-kompilex returned nonzero exit code: " + exit + "\nExamine output to see errors."); } } catch (IOException | InterruptedException e) { - throw KEMException.criticalError("Error with I/O while executing llvm-kompile", e); + throw KEMException.criticalError("Error with I/O while executing llvm-kompilex", e); } } diff --git a/package/arch/PKGBUILD b/package/arch/PKGBUILD index deebdc9332e..5d488b97502 100644 --- a/package/arch/PKGBUILD +++ b/package/arch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dwight Guth pkgname=kframework-git -pkgver=5.4.3 +pkgver=5.4.4 pkgrel=1 epoch= pkgdesc="K framework toolchain. Includes K Framework compiler for K language definitions, and K interpreter and prover for programs written in languages defined in K." diff --git a/package/debian/changelog b/package/debian/changelog index 81d8387e180..35fc3cc4f60 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,4 +1,4 @@ -kframework (5.4.3) unstable; urgency=medium +kframework (5.4.4) unstable; urgency=medium * Initial Release. diff --git a/package/version b/package/version index 6ffbe8ba8eb..426c1c17944 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -5.4.3 +5.4.4 diff --git a/src/main/scripts/test-in-container-debian b/src/main/scripts/test-in-container-debian index 0c360debfb3..40e11f154b6 100755 --- a/src/main/scripts/test-in-container-debian +++ b/src/main/scripts/test-in-container-debian @@ -1,5 +1,5 @@ #!/bin/sh -ex -K_VERSION=5.4.3 +K_VERSION=5.4.4 export DEBIAN_FRONTEND=noninteractive apt-get update apt-get upgrade --yes