diff --git a/compiler/lib/Runtime/CMakeLists.txt b/compiler/lib/Runtime/CMakeLists.txt
index 5925b7df9..b58956b12 100644
--- a/compiler/lib/Runtime/CMakeLists.txt
+++ b/compiler/lib/Runtime/CMakeLists.txt
@@ -10,10 +10,20 @@ if(CONCRETELANG_PARALLEL_EXECUTION_ENABLED)
   install(TARGETS DFRuntime EXPORT DFRuntime)
   install(EXPORT DFRuntime DESTINATION "./")
 
-  target_link_libraries(ConcretelangRuntime Concrete pthread m dl HPX::hpx $<TARGET_OBJECTS:mlir_c_runner_utils>)
+
+  target_link_libraries(ConcretelangRuntime
+    Concrete
+    pthread
+    m
+    dl
+    $<TARGET_OBJECTS:mlir_c_runner_utils>
+    -Wl,--no-as-needed
+    DFRuntime
+    omp
+  )
 else()
   target_link_libraries(ConcretelangRuntime Concrete pthread m dl $<TARGET_OBJECTS:mlir_c_runner_utils>)
 endif()
 
-install(TARGETS ConcretelangRuntime EXPORT ConcretelangRuntime)
+install(TARGETS ConcretelangRuntime omp EXPORT ConcretelangRuntime)
 install(EXPORT ConcretelangRuntime DESTINATION "./")
diff --git a/compiler/tests/Support/CMakeLists.txt b/compiler/tests/Support/CMakeLists.txt
index de52743c8..973064f8e 100644
--- a/compiler/tests/Support/CMakeLists.txt
+++ b/compiler/tests/Support/CMakeLists.txt
@@ -17,7 +17,6 @@ target_link_libraries(
   support_unit_test
   gtest_main
   ConcretelangClientLib
-  ConcretelangSupport
 )
 
 include(GoogleTest)