Skip to content

Commit

Permalink
Merge pull request #32 from katrinafyi/alive2-aslp-update
Browse files Browse the repository at this point in the history
alive2-aslp: 0-unstable-2024-12-16 -> 0-unstable-2024-12-17
  • Loading branch information
katrinafyi authored Dec 20, 2024
2 parents 102aef2 + 3345c04 commit e1117d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions llvm-translator/alive2-aslp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,20 @@

(alive2-regehr.override { inherit llvmPackages; }).overrideAttrs (prev: {
pname = "alive2-aslp";
version = "0-unstable-2024-12-16";
version = "0-unstable-2024-12-17";

buildInputs = prev.buildInputs ++ [ aslp-cpp antlr.runtime.cpp ];
nativeBuildInputs = prev.nativeBuildInputs ++ [ jre makeWrapper ];

src = fetchFromGitHub {
owner = "katrinafyi";
repo = "alive2";
rev = "a41421eecbfb786925c936c1b4131f33937b615c";
hash = "sha256-+8Q1m4QX0/jA6AJ5gWaCytzCB6UOMAHE0SZo/wnmogg=";
rev = "e51f11b74c77682700bdd8e886c56a562a338b69";
hash = "sha256-fvcvC/SJOtLq0tR0h/GT983ScHZnXbjui9PwutJtnsA=";
};

CXXFLAGS = (prev.CXXFLAGS or "") + " -Wno-error=deprecated-declarations";

cmakeFlags = prev.cmakeFlags
++ [ (lib.cmakeFeature "ANTLR4_JAR_LOCATION" "${antlr.jarLocation}") ];

Expand Down
2 changes: 1 addition & 1 deletion llvm-translator/alive2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ buildStdenv.mkDerivation {
buildInputs = [ z3 zlib ncurses llvmPackages.libllvm ];

cmakeFlags = [ "-DBUILD_TV=1" "-DGIT_EXECUTABLE=${git-am-shim}" ];
CXXFLAGS = "-Wno-error=cpp -Wno-error=deprecated";
CXXFLAGS = "-Wno-error=cpp";

postPatch = ''
substituteInPlace scripts/alivecc.in \
Expand Down

0 comments on commit e1117d4

Please sign in to comment.