Skip to content

Commit

Permalink
refactor: remove static libstdc++ linking
Browse files Browse the repository at this point in the history
  • Loading branch information
Curve committed Nov 18, 2023
1 parent 843cf9b commit 58f0f8f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
source /root/.bashrc
cd /work
pnpm install --ignore-scripts && pnpm run install:static
pnpm install --ignore-scripts && pnpm run install
- name: ♻️ Upload Artifact
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
source /root/.bashrc
cd /work
pnpm install --ignore-scripts && pnpm run install:static
pnpm install --ignore-scripts && pnpm run install
- name: ♻️ Upload Artifact
uses: actions/upload-artifact@v3
Expand Down
7 changes: 1 addition & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ project(venmic LANGUAGES CXX VERSION 2.1.2)
option(venmic_addon "Build as addon" OFF)
option(venmic_server "Build as rest server" ON)
option(venmic_prefer_remote "Prefer remote packages over local packages" ON)
option(venmic_static_cxx "Static link libstdc++ and libgcc" OFF)

# --------------------------------------------------------------------------------------------------------
# Addon and Rest-Server are mutually exclusive
Expand Down Expand Up @@ -48,10 +47,6 @@ if (PROJECT_IS_TOP_LEVEL)
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Wpedantic -Werror -pedantic -pedantic-errors -Wfatal-errors)
endif()

if (venmic_static_cxx)
target_link_libraries(${PROJECT_NAME} PRIVATE -static-libgcc -static-libstdc++)
endif()

target_compile_options(${PROJECT_NAME} PRIVATE -Wno-missing-field-initializers -Wno-cast-function-type)

# --------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -100,7 +95,7 @@ CPMFindPackage(

CPMFindPackage(
NAME glaze
VERSION 1.5.7
VERSION 1.6.0
GIT_REPOSITORY "https://github.com/stephenberry/glaze"
)

Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"clean": "cmake-js clean",
"test": "node tests/node/*.js",
"cpcmds": "cmake-js configure --CDvenmic_addon=ON --CDCMAKE_EXPORT_COMPILE_COMMANDS=ON",
"install": "pkg-prebuilds-verify ./lib/options.js || cmake-js compile --CDvenmic_addon=ON",
"install:static": "pkg-prebuilds-verify ./lib/options.js || cmake-js compile --CDvenmic_addon=ON --CDvenmic_static_cxx=ON"
"install": "pkg-prebuilds-verify ./lib/options.js || cmake-js compile --CDvenmic_addon=ON"
},
"os": [
"linux"
Expand Down

0 comments on commit 58f0f8f

Please sign in to comment.