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.

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

Use new llvm-kompilex script #2871

Merged
merged 4 commits into from
Sep 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 install-k
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,14 @@ public void accept(Backend.Holder h) {
private void llvmKompile(String type, String executable) {
ProcessBuilder pb = files.getProcessBuilder();
List<String> 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");
Expand All @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion package/arch/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Maintainer: Dwight Guth <dwight.guth@runtimeverification.com>
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."
Expand Down
2 changes: 1 addition & 1 deletion package/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
kframework (5.4.3) unstable; urgency=medium
kframework (5.4.4) unstable; urgency=medium

* Initial Release.

Expand Down
2 changes: 1 addition & 1 deletion package/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.4.3
5.4.4
2 changes: 1 addition & 1 deletion src/main/scripts/test-in-container-debian
Original file line number Diff line number Diff line change
@@ -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
Expand Down