Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dylan-conway committed Nov 24, 2024
1 parent 64fa224 commit ef367ff
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 26 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ RUN --mount=type=tmpfs,target=/webkitbuild \
-DENABLE_FTL_JIT=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DALLOW_LINE_AND_COLUMN_NUMBER_IN_BUILTINS=ON \
-DENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE=ON \
-DENABLE_REMOTE_INSPECTOR=ON \
-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
-DCMAKE_AR=$(which llvm-ar) \
Expand Down
1 change: 0 additions & 1 deletion Dockerfile.musl
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ RUN --mount=type=tmpfs,target=/webkitbuild \
-DENABLE_FTL_JIT=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DALLOW_LINE_AND_COLUMN_NUMBER_IN_BUILTINS=ON \
-DENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE=ON \
-DENABLE_REMOTE_INSPECTOR=ON \
-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
-DCMAKE_AR=$(which llvm-ar) \
Expand Down
5 changes: 0 additions & 5 deletions Source/cmake/OptionsCommon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebIn
set(GCC_OFFLINEASM_SOURCE_MAP_DEFAULT ON)
endif ()

set(GCC_OFFLINEASM_SOURCE_MAP_DEFAULT ON)
if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(GCC_OFFLINEASM_SOURCE_MAP_DEFAULT ON)
endif ()

option(GCC_OFFLINEASM_SOURCE_MAP
"Produce debug line information for offlineasm-generated code"
${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
Expand Down
17 changes: 0 additions & 17 deletions Source/cmake/OptionsJSCOnly.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,6 @@ else ()
endif ()
WEBKIT_OPTION_END()

WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFINE(ENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE "Only set VMEntryScope once per globalobject" PUBLIC OFF)
if (ENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE)
set(ENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE ON)
SET_AND_EXPOSE_TO_BUILD(ENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE 1)
endif ()
WEBKIT_OPTION_END()

if (WIN32)
set(ENABLE_API_TESTS OFF)
else ()
Expand All @@ -111,15 +103,6 @@ if (WTF_CPU_ARM OR WTF_CPU_MIPS)
SET_AND_EXPOSE_TO_BUILD(USE_CAPSTONE TRUE)
endif ()

if (APPLE)

# SET_AND_EXPOSE_TO_BUILD(USE_FOUNDATION TRUE)
# SET_AND_EXPOSE_TO_BUILD(USE_CF TRUE)
# SET_AND_EXPOSE_TO_BUILD(USE_CF_RETAIN_PTR TRUE)
# SET_AND_EXPOSE_TO_BUILD(USE_EXPORT_MACROS TRUE)
# SET_AND_EXPOSE_TO_BUILD(USE_APPLE_INTERNAL_SDK TRUE)
endif ()

WEBKIT_OPTION_BEGIN()
WEBKIT_OPTION_DEFINE(ENABLE_BUN_SKIP_FAILING_ASSERTIONS "Skip failing ASSERT when targeting Bun" PUBLIC OFF)
if (ENABLE_BUN_SKIP_FAILING_ASSERTIONS)
Expand Down
1 change: 0 additions & 1 deletion mac-release.bash
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ cd $RUNNER_TEMP/webkit-release
cmake \
-DPORT="JSCOnly" \
-DENABLE_STATIC_JSC=ON \
-DENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE=ON \
-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-DENABLE_BUN_SKIP_FAILING_ASSERTIONS=ON \
-DUSE_THIN_ARCHIVES=OFF \
Expand Down
1 change: 0 additions & 1 deletion windows-release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ $WebAssemblyState = if ($NoWebassembly) { "OFF" } else { "ON" }
cmake -S . -B $WebKitBuild `
-DPORT="JSCOnly" `
-DENABLE_STATIC_JSC=ON `
-DENABLE_SINGLE_THREADED_VM_ENTRY_SCOPE=ON `
-DALLOW_LINE_AND_COLUMN_NUMBER_IN_BUILTINS=ON `
"-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" `
-DUSE_THIN_ARCHIVES=OFF `
Expand Down

0 comments on commit ef367ff

Please sign in to comment.