Skip to content

Commit b054c64

Browse files
committed
fix(cmake): do not build the modules when building arkscript statically, and disable asan&ubsan for static builds
1 parent 0ae4444 commit b054c64

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142

143143
install-arkscript:
144144
runs-on: ${{ matrix.os }}
145-
name: Install ArkScript on ${{ matrix.os }}
145+
name: "Install ArkScript on ${{ matrix.os }} (static: ${{ matrix.static }})"
146146
needs: [ check ]
147147

148148
strategy:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ endif ()
202202
# Create the different (optional) targets
203203
#####################################################
204204

205-
if (ARK_BUILD_MODULES)
205+
if (ARK_BUILD_MODULES AND NOT ARK_STATIC)
206206
get_directory_property(old_dir_compile_options COMPILE_OPTIONS)
207207
add_compile_options(-w)
208208
add_subdirectory(${ark_SOURCE_DIR}/lib/modules)
@@ -358,8 +358,8 @@ if (ARK_BUILD_EXE)
358358
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
359359
endif ()
360360

361-
if (ARK_SANITIZERS)
362-
message(STATUS "Enabling address sanitizer and undefined behavior sanitizer")
361+
if (ARK_SANITIZERS AND NOT ARK_STATIC)
362+
message(STATUS "Enabling ASAN and UBSAN")
363363
add_address_sanitizer()
364364
add_undefined_sanitizer()
365365
endif ()

0 commit comments

Comments
 (0)