diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-18 15:33:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-18 15:33:24 +0200 |
| commit | d2574e6352c26d9d40256e606376a3e0f6638225 (patch) | |
| tree | 56c0cfaf2aee853b551f5b4fc51d4a9b98ad7550 | |
| parent | eaeb80a4cf365f8df058e9490d73d86e679c136b (diff) | |
| parent | d56db9de7c55117a2c2cbde7a0d14a3cfc215e64 (diff) | |
Merge pull request #24110 from vespa-engine/toregge/remove-kludge-for-rhel-8-2v8.54.61
Remove kludge for RHEL 8.2.
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp | 13 |
2 files changed, 0 insertions, 17 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt index 25e9a469f93..fffbd12764b 100644 --- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt @@ -32,7 +32,3 @@ vespa_add_library(searchcore_pcommon STATIC EXTERNAL_DEPENDS ${VESPA_STDCXX_FS_LIB} ) - -if(VESPA_OS_DISTRO_COMBINED STREQUAL "rhel 8.2" OR VESPA_OS_DISTRO_COMBINED STREQUAL "centos 8") - set_source_files_properties(hw_info_sampler.cpp PROPERTIES COMPILE_FLAGS -DRHEL_8_2_KLUDGE) -endif() diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp index ea2d2de8b41..2f054843dd3 100644 --- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp +++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp @@ -165,16 +165,3 @@ HwInfoSampler::sampleDiskWriteSpeed(const vespalib::string &path, const Config & } } - -#ifdef RHEL_8_2_KLUDGE - -// Kludge to avoid unresolved symbols with gcc-toolset-9 on RHEL 8.2 -#include <codecvt> - -namespace std { - -template class codecvt_utf8<wchar_t>; - -} - -#endif |