From d8732c18918c04869d73a0e90598708ecd54adc4 Mon Sep 17 00:00:00 2001 From: Jarred Sumner Date: Tue, 16 Jul 2024 17:10:48 -0700 Subject: [PATCH] Disable PIC on Linux --- Dockerfile | 2 +- Source/cmake/OptionsJSCOnly.cmake | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 74232f0400b86..d13198797cf71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG WEBKIT_RELEASE_TYPE=Release ARG CPU=native ARG LTO_FLAG="-flto='full'" ARG LLVM_VERSION="16" -ARG DEFAULT_CFLAGS="-mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -ffunction-sections -fdata-sections -faddrsig -fno-asynchronous-unwind-tables -g1 -DU_STATIC_IMPLEMENTATION=1 " +ARG DEFAULT_CFLAGS="-mno-omit-leaf-frame-pointer -fno-omit-frame-pointer -ffunction-sections -fdata-sections -faddrsig -fno-asynchronous-unwind-tables -DU_STATIC_IMPLEMENTATION=1 " ARG DEBIAN_VERSION="bullseye" FROM bitnami/minideb:${DEBIAN_VERSION} as base diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake index 344d30f41a073..66dcf4d01426a 100644 --- a/Source/cmake/OptionsJSCOnly.cmake +++ b/Source/cmake/OptionsJSCOnly.cmake @@ -22,9 +22,6 @@ if (USE_BUN_JSC_ADDITIONS) if (WIN32) SET_AND_EXPOSE_TO_BUILD(JS_NO_EXPORT 1) - elseif (APPLE) - else () - set(CMAKE_POSITION_INDEPENDENT_CODE False) endif() endif () @@ -74,9 +71,8 @@ if (ENABLE_REMOTE_INSPECTOR) set(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS ON) SET_AND_EXPOSE_TO_BUILD(USE_INSPECTOR_SOCKET_SERVER 1) SET_AND_EXPOSE_TO_BUILD(USE_UNIX_DOMAIN_SOCKETS 1) -else ( +else () set(ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS OFF) -) endif () WEBKIT_OPTION_END()