Skip to content

Commit

Permalink
Fix failing tonlib compilation on ubuntu with nixpkgs (ton-blockchain…
Browse files Browse the repository at this point in the history
…#1309)

* force gcc-11+

* install gcc-11+

* fix missing gcc-11 in nix build on ubuntu

* cleanup
  • Loading branch information
neodix42 authored Oct 22, 2024
1 parent 66e81f5 commit f82827e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion assembly/native/build-macos-portable.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ else
fi

export NONINTERACTIVE=1
brew install ninja pkg-config automake libtool autoconf
brew install ninja pkg-config automake libtool autoconf texinfo
brew install llvm@16


Expand Down
5 changes: 4 additions & 1 deletion assembly/nix/linux-arm64-tonlib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ pkgs.llvmPackages_16.stdenv.mkDerivation {
];

dontAddStaticConfigureFlags = false;
doCheck = false;
doInstallCheck = false;

cmakeFlags = [
"-DTON_USE_ABSEIL=OFF"
"-DTON_USE_ABSEIL=ON"
"-DNIX=ON"
"-DTON_ONLY_TONLIB=ON"
];

LDFLAGS = [
Expand Down
3 changes: 3 additions & 0 deletions assembly/nix/linux-x86-64-tonlib.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ stdenv227.mkDerivation {
];

dontAddStaticConfigureFlags = false;
doCheck = false;
doInstallCheck = false;

cmakeFlags = [
"-DTON_USE_ABSEIL=ON"
"-DNIX=ON"
"-DTON_ONLY_TONLIB=ON"
];

LDFLAGS = [
Expand Down

0 comments on commit f82827e

Please sign in to comment.