From d665a115e23dbfd83609725f45aa1891896a70d2 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Fri, 4 Aug 2023 11:17:01 -0700 Subject: [PATCH] SWDEV-366827 - Disable file reorg backward compatibility support by default Change-Id: Ifb0e3ea1a2217e287498efc26369596209be8c93 [ROCm/clr commit: 03ad34a6c68ace99f1fe5a8db6fe7d3a3199dc39] --- projects/clr/hipamd/CMakeLists.txt | 5 +---- projects/clr/opencl/CMakeLists.txt | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 92ca86b225..8a99ca6a6f 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -46,10 +46,7 @@ list(APPEND CMAKE_MODULE_PATH ${HIP_COMMON_DIR}/cmake) option(BUILD_HIPIFY_CLANG "Enable building the CUDA->HIP converter" OFF) option(__HIP_ENABLE_PCH "Enable/Disable pre-compiled hip headers" ON) option(HIP_OFFICIAL_BUILD "Enable/Disable for mainline/staging builds" OFF) -# Disable file reorg backward compatibility for ASAN packaging -if(NOT ENABLE_ASAN_PACKAGING) - option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" ON) -endif() +option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" OFF) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi") diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index bd5e6a97a4..f6aaf4409a 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -17,10 +17,7 @@ include(GNUInstallDirs) option(BUILD_TESTS "Enable building OpenCL tests" OFF) option(BUILD_ICD "Enable building OpenCL ICD Loader" ON) option(EMU_ENV "Enable building for emulation environment" OFF) -# Disable file reorg backward compatibilty for ASAN build -if(NOT ENABLE_ASAN_PACKAGING) - option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward compatibility" ON) -endif() +option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorganization backward compatibility" OFF) # Add flags to generate PDB files with full symbolic information if(MSVC)