diff --git a/Code/Framework/AzCore/Tests/DOM/DomPatchBenchmarks.cpp b/Code/Framework/AzCore/Tests/DOM/DomPatchBenchmarks.cpp
index e44ba3ce67..d67597255f 100644
--- a/Code/Framework/AzCore/Tests/DOM/DomPatchBenchmarks.cpp
+++ b/Code/Framework/AzCore/Tests/DOM/DomPatchBenchmarks.cpp
@@ -78,7 +78,7 @@ namespace AZ::Dom::Benchmark
             if (apply)
             {
                 auto patchInfo = GenerateHierarchicalDeltaPatch(m_before, m_after);
-                for (auto _ : state)
+                for ([[maybe_unused]] auto _ : state)
                 {
                     auto patchResult = patchInfo.m_forwardPatches.Apply(m_before);
                     benchmark::DoNotOptimize(patchResult);
@@ -86,7 +86,7 @@ namespace AZ::Dom::Benchmark
             }
             else
             {
-                for (auto _ : state)
+                for ([[maybe_unused]] auto _ : state)
                 {
                     auto patchInfo = GenerateHierarchicalDeltaPatch(m_before, m_after);
                     benchmark::DoNotOptimize(patchInfo);
diff --git a/Code/Framework/AzCore/Tests/DOM/DomPathBenchmarks.cpp b/Code/Framework/AzCore/Tests/DOM/DomPathBenchmarks.cpp
index 10c5fa1394..56d1e1f6ab 100644
--- a/Code/Framework/AzCore/Tests/DOM/DomPathBenchmarks.cpp
+++ b/Code/Framework/AzCore/Tests/DOM/DomPathBenchmarks.cpp
@@ -104,7 +104,7 @@ namespace AZ::Dom::Benchmark
         PathEntry endOfArray;
         endOfArray.SetEndOfArray();
 
-        for (auto _ : state)
+        for ([[maybe_unused]] auto _ : state)
         {
             benchmark::DoNotOptimize(name == name);
             benchmark::DoNotOptimize(name == index);
diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
index 187ace1cdb..549e8b8bea 100644
--- a/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
+++ b/Gems/SurfaceData/Code/Tests/SurfaceDataBenchmarks.cpp
@@ -289,7 +289,7 @@ namespace UnitTest
             tag = randomGenerator.GetRandom();
         }
 
-        for (auto _ : state)
+        for ([[maybe_unused]] auto _ : state)
         {
             // We'll benchmark this two ways:
             // 1. We clear each time, which means each AddSurfaceWeightIfGreater call will search the whole list then add.
@@ -340,7 +340,7 @@ namespace UnitTest
             comparisonTags.emplace_back(tag ^ 0x01);
         }
 
-        for (auto _ : state)
+        for ([[maybe_unused]] auto _ : state)
         {
             // Test to see if any of our tags match.
             // All of comparison tags should get compared against all of the added tags.
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..09a6feaf15 100644
--- a/cmake/Platform/Linux/Configurations_linux.cmake
+++ b/cmake/Platform/Linux/Configurations_linux.cmake
@@ -16,10 +16,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             __linux__
             LINUX64
         COMPILATION
-            -fPIC
             -msse4.1
         LINK_NON_STATIC
-            -Wl,-undefined,error
+            -Wl,--no-undefined
             -fpie
             -Wl,-z,relro,-z,now
             -Wl,-z,noexecstack
@@ -47,7 +46,6 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             __linux__
             LINUX64
         COMPILATION
-            -fPIC
             -msse4.1
         LINK_NON_STATIC
             ${LY_GCC_GCOV_LFLAGS}