Try fix

disintar · Dec 15, 2024 · 6e62df8 · 6e62df8
1 parent 25517d4
commit 6e62df8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/assembly/nix/linux-arm64-static.nix b/assembly/nix/linux-arm64-static.nix
@@ -44,10 +44,13 @@ stdenv.mkDerivation {
       "-DMHD_INCLUDE_DIR=${microhttpdmy}/usr/local/include"
       "-DMHD_LIBRARY=${microhttpdmy}/usr/local/lib/libmicrohttpd.a"
       "-DCMAKE_CTEST_ARGUMENTS=--timeout;1800"
-      "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+      "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
       "-DCMAKE_C_FLAGS=-w"
       "-DCMAKE_CXX_STANDARD=20"
-      "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+      "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+      "-DCMAKE_LINK_SEARCH_START_STATIC=ON"
+      "-DCMAKE_LINK_SEARCH_END_STATIC=ON"
+      "-DTON_USE_JEMALLOC=ON"
     ];
 
   LDFLAGS = [

diff --git a/assembly/nix/linux-arm64-tonlib.nix b/assembly/nix/linux-arm64-tonlib.nix
@@ -48,7 +48,7 @@ pkgs.llvmPackages_16.stdenv.mkDerivation {
     "-DMHD_LIBRARY=${microhttpdmy}/usr/local/lib/libmicrohttpd.a"
     "-DCMAKE_C_FLAGS=-w"
     "-DCMAKE_CXX_STANDARD=20"
-    "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
   ];
 
   LDFLAGS = [

diff --git a/assembly/nix/linux-x86-64-static.nix b/assembly/nix/linux-x86-64-static.nix
@@ -44,9 +44,12 @@ stdenv.mkDerivation {
     "-DMHD_INCLUDE_DIR=${microhttpdmy}/usr/local/include"
     "-DMHD_LIBRARY=${microhttpdmy}/usr/local/lib/libmicrohttpd.a"
     "-DCMAKE_CTEST_ARGUMENTS=--timeout;1800"
-    "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
     "-DCMAKE_C_FLAGS=-w"
     "-DCMAKE_CXX_STANDARD=20"
+    "-DCMAKE_LINK_SEARCH_START_STATIC=ON"
+    "-DCMAKE_LINK_SEARCH_END_STATIC=ON"
+    "-DTON_USE_JEMALLOC=ON"
   ];
 
   NIX_CFLAGS_COMPILE = [

diff --git a/assembly/nix/linux-x86-64-tonlib.nix b/assembly/nix/linux-x86-64-tonlib.nix
@@ -54,7 +54,7 @@ stdenv227.mkDerivation {
   cmakeFlags = [
     "-DTON_USE_ABSEIL=ON"
     "-DNIX=ON"
-    "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
     "-DCMAKE_C_FLAGS=-w"
     "-DCMAKE_CXX_STANDARD=20"
   ];

diff --git a/assembly/nix/macos-static.nix b/assembly/nix/macos-static.nix
@@ -54,6 +54,9 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
     "-DCMAKE_CXX_FLAGS=-w"
     "-DCMAKE_C_FLAGS=-w"
     "-DCMAKE_CXX_STANDARD=20"
+    "-DCMAKE_LINK_SEARCH_START_STATIC=ON"
+    "-DCMAKE_LINK_SEARCH_END_STATIC=ON"
+    "-DTON_USE_JEMALLOC=ON"
   ];
 
   LDFLAGS = [

diff --git a/assembly/nix/macos-tonlib.nix b/assembly/nix/macos-tonlib.nix
@@ -41,7 +41,7 @@ pkgs.llvmPackages_14.stdenv.mkDerivation {
     "-DNIX=ON"
     "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
     "-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=11.3"
-    "-DCMAKE_CXX_FLAGS=-std=c++20 -Wno-deprecated-declarations -Wno-unused-but-set-variable"
+    "-DCMAKE_CXX_FLAGS=-stdlib=libc++ -Wno-deprecated-declarations -Wno-unused-but-set-variable"
     "-DCMAKE_C_FLAGS=-w"
     "-DCMAKE_CXX_STANDARD=20"
   ];