diff --git a/cmake/Platform/Common/Clang/Configurations_clang.cmake b/cmake/Platform/Common/Clang/Configurations_clang.cmake
index fee81f7132..88789ad0d2 100644
--- a/cmake/Platform/Common/Clang/Configurations_clang.cmake
+++ b/cmake/Platform/Common/Clang/Configurations_clang.cmake
@@ -20,8 +20,6 @@ ly_append_configurations_options(
         -Wall
         -Werror
 
-        -fpie                   # Position-Independent Executables
-
         ###################
         # Disabled warnings (please do not disable any others without first consulting sig-build)
         ###################
diff --git a/cmake/Platform/Common/Configurations_common.cmake b/cmake/Platform/Common/Configurations_common.cmake
index d16dfa3eea..c2ba5477e7 100644
--- a/cmake/Platform/Common/Configurations_common.cmake
+++ b/cmake/Platform/Common/Configurations_common.cmake
@@ -62,3 +62,8 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
         ly_set(CMAKE_JOB_POOL_LINK link_job_pool)
     endif()
 endif()
+
+set(CMAKE_POSITION_INDEPENDENT_CODE True)
+
+include(CheckPIESupported)
+check_pie_supported()
diff --git a/cmake/Platform/Linux/Configurations_linux.cmake b/cmake/Platform/Linux/Configurations_linux.cmake
index 3c3ea5bf62..37ef2f8fc3 100644
--- a/cmake/Platform/Linux/Configurations_linux.cmake
+++ b/cmake/Platform/Linux/Configurations_linux.cmake
@@ -16,7 +16,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             __linux__
             LINUX64
         COMPILATION
-            -fPIC
             -msse4.1
         LINK_NON_STATIC
             -Wl,-undefined,error
@@ -47,7 +46,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             __linux__
             LINUX64
         COMPILATION
-            -fPIC
             -msse4.1
         LINK_NON_STATIC
             ${LY_GCC_GCOV_LFLAGS}