[llvm] 584a5d1 - Remove obsolete msvc workaround from AddLLVM.cmake

Stella Stamenova via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 9 10:50:00 PDT 2021


Author: Stella Stamenova
Date: 2021-09-09T10:49:34-07:00
New Revision: 584a5d171eca20e584173f7e2db2c416bcd3fbe8

URL: https://github.com/llvm/llvm-project/commit/584a5d171eca20e584173f7e2db2c416bcd3fbe8
DIFF: https://github.com/llvm/llvm-project/commit/584a5d171eca20e584173f7e2db2c416bcd3fbe8.diff

LOG: Remove obsolete msvc workaround from AddLLVM.cmake

The original change to add the workaround is from 10 years ago and a lot has happened with msvc and cmake and llvm's usage of cmake since and we no longer need the workaround for any scenarios that I am aware of. Build more is now correctly configured for multi-configuration generators such as Visual Studio.

The workaround is, however, causing issues with some of the recent mlir tests as because of the workaround we cannot correctly determine whether assertions are enabled (see https://reviews.llvm.org/D105961).

The original change is:

```
commit b46fdac4609df2613177813d43a124e3d9a8a306
Author: Andrew Trick <atrick at apple.com>
Date:   Tue Jun 28 16:32:01 2011

    cmake: Our MSVC build does not support config-time build mode.

    llvm-svn: 134008
```

Reviewed By: mehdi_amini

Differential Revision: https://reviews.llvm.org/D109521

Added: 
    

Modified: 
    llvm/cmake/modules/AddLLVM.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index d833bacc9748..c5a9e0209f13 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -1638,7 +1638,7 @@ function(configure_lit_site_cfg site_in site_out)
     set(ENABLE_SHARED "0")
   endif()
 
-  if(LLVM_ENABLE_ASSERTIONS AND NOT MSVC_IDE)
+  if(LLVM_ENABLE_ASSERTIONS)
     set(ENABLE_ASSERTIONS "1")
   else()
     set(ENABLE_ASSERTIONS "0")


        


More information about the llvm-commits mailing list