diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt
index f163d45342874..0d07cb43eea82 100644
--- a/bolt/CMakeLists.txt
+++ b/bolt/CMakeLists.txt
@@ -97,7 +97,11 @@ if (BOLT_ENABLE_RUNTIME)
     STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-stamps
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-bins
     CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+               -DCMAKE_ASM_FLAGS=${CMAKE_ASM_FLAGS}
+               -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
+               -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+               -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
                -DCMAKE_BUILD_TYPE=Release
                -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
diff --git a/bolt/test/runtime/X86/section-order.test b/bolt/test/runtime/X86/section-order.test
index a1317daba50e8..5c2bca57d8bc8 100644
--- a/bolt/test/runtime/X86/section-order.test
+++ b/bolt/test/runtime/X86/section-order.test
@@ -5,6 +5,6 @@ RUN: llvm-bolt %t.exe -o %t --instrument
 RUN: llvm-readelf --section-headers %t | FileCheck %s
 
 ## Verify that llvm-bolt outputs new sections in expected order.
-CHECK: .text.bolt.extra.1
-CHECK: .rodata.bolt.extra.1
-CHECK: .data.bolt.extra.1
+CHECK: .text{{.*}}.bolt.extra.1
+CHECK: .rodata{{.*}}.bolt.extra.1
+CHECK: .data{{.*}}.bolt.extra.1