include static gsl

neodix42 · Dec 12, 2023 · 4b34878 · 4b34878
1 parent d307e2e
commit 4b34878
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu-compile-portable.yml b/.github/workflows/ubuntu-compile-portable.yml
@@ -21,5 +21,5 @@ jobs:
     - name: Upload artifacts
       uses: actions/upload-artifact@master
       with:
-        name: ton-binaries-${{ matrix.os }}
+        name: ton-binaries-linux-x86-64
         path: artifacts
diff --git a/assembly/native/build-ubuntu-20.04-portable.sh b/assembly/native/build-ubuntu-20.04-portable.sh
@@ -138,7 +138,9 @@ cmake -GNinja .. \
 -DSODIUM_LIBRARY_RELEASE=$sodiumPath/src/libsodium/.libs/libsodium.a \
 -DMHD_FOUND=1 \
 -DMHD_INCLUDE_DIR=$libmicrohttpdPath/src/include \
--DMHD_LIBRARY=$libmicrohttpdPath/src/microhttpd/.libs/libmicrohttpd.a
+-DMHD_LIBRARY=$libmicrohttpdPath/src/microhttpd/.libs/libmicrohttpd.a \
+-DCMAKE_CXX_FLAGS="-fPIC -static"
+
 
 test $? -eq 0 || { echo "Can't configure ton"; exit 1; }
 

diff --git a/emulator/CMakeLists.txt b/emulator/CMakeLists.txt
@@ -30,6 +30,7 @@ add_library(emulator_static STATIC ${EMULATOR_STATIC_SOURCE})
 target_link_libraries(emulator_static PUBLIC ton_crypto ton_block smc-envelope)
 
 if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS)
+  set(CMAKE_CXX_FLAGS "")
   add_library(emulator SHARED ${EMULATOR_SOURCE} ${EMULATOR_HEADERS})
 else()
   add_library(emulator STATIC ${EMULATOR_SOURCE} ${EMULATOR_HEADERS})

diff --git a/tonlib/CMakeLists.txt b/tonlib/CMakeLists.txt
@@ -95,6 +95,7 @@ set(TONLIB_JSON_SOURCE tonlib/tonlib_client_json.cpp)
 
 include(GenerateExportHeader)
 if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS)
+  set(CMAKE_CXX_FLAGS "")
   add_library(tonlibjson SHARED ${TONLIB_JSON_SOURCE} ${TONLIB_JSON_HEADERS})
 else()
   add_library(tonlibjson STATIC ${TONLIB_JSON_SOURCE} ${TONLIB_JSON_HEADERS})