From fb95ee2f58ec08d7aac7351841f7c421c3653620 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Sun, 26 Apr 2020 18:18:10 +0200
Subject: Use gcc-toolset-9 on CentOS 8 and RHEL 8.

---
 vespamalloc/src/tests/allocfree/CMakeLists.txt | 2 +-
 vespamalloc/src/tests/test1/CMakeLists.txt     | 2 +-
 vespamalloc/src/vespamalloc/CMakeLists.txt     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'vespamalloc')

diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt
index 52c0c03d079..34d402d0c60 100644
--- a/vespamalloc/src/tests/allocfree/CMakeLists.txt
+++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt
@@ -21,7 +21,7 @@ vespa_add_executable(vespamalloc_linklist_test_app
     $<TARGET_OBJECTS:vespamalloc_util>
     DEPENDS
     dl
-    atomic
+    ${VESPA_ATOMIC_LIB}
 )
 vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/allocfree_test.sh BENCHMARK
                DEPENDS vespamalloc_realloc_test_app vespamalloc_allocfree_shared_test_app vespamalloc_linklist_test_app
diff --git a/vespamalloc/src/tests/test1/CMakeLists.txt b/vespamalloc/src/tests/test1/CMakeLists.txt
index cbfb9543cda..cade2e092b4 100644
--- a/vespamalloc/src/tests/test1/CMakeLists.txt
+++ b/vespamalloc/src/tests/test1/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespamalloc_testatomic_app TEST
     SOURCES
     testatomic.cpp
     DEPENDS
-    atomic
+    ${VESPA_ATOMIC_LIB}
 )
 vespa_add_test(NAME vespamalloc_testatomic_app NO_VALGRIND COMMAND vespamalloc_testatomic_app)
diff --git a/vespamalloc/src/vespamalloc/CMakeLists.txt b/vespamalloc/src/vespamalloc/CMakeLists.txt
index ac7fd300828..1fe550ad95a 100644
--- a/vespamalloc/src/vespamalloc/CMakeLists.txt
+++ b/vespamalloc/src/vespamalloc/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_add_library(vespamalloc
     $<TARGET_OBJECTS:vespamalloc_util>
     INSTALL lib64/vespa/malloc
     DEPENDS
-    atomic
+    ${VESPA_ATOMIC_LIB}
     dl
 )
 vespa_add_library(vespamallocd
@@ -14,7 +14,7 @@ vespa_add_library(vespamallocd
     $<TARGET_OBJECTS:vespamalloc_util>
     INSTALL lib64/vespa/malloc
     DEPENDS
-    atomic
+    ${VESPA_ATOMIC_LIB}
     dl
 )
 vespa_add_library(vespamallocdst16
@@ -23,7 +23,7 @@ vespa_add_library(vespamallocdst16
     $<TARGET_OBJECTS:vespamalloc_util>
     INSTALL lib64/vespa/malloc
     DEPENDS
-    atomic
+    ${VESPA_ATOMIC_LIB}
     dl
 )
 vespa_add_library(vespamallocdst16_nl
@@ -32,7 +32,7 @@ vespa_add_library(vespamallocdst16_nl
     $<TARGET_OBJECTS:vespamalloc_util>
     INSTALL lib64/vespa/malloc
     DEPENDS
-    atomic
+    ${VESPA_ATOMIC_LIB}
     dl
 )
 vespa_add_library(vespammap
-- 
cgit v1.2.3