[PATCH] D97182: [clang] fix cmake wrong variable name from RTLIBS to RTLIB

2021-02-22 Thread Philip Lassen via Phabricator via cfe-commits
philass updated this revision to Diff 325690.
philass added a comment.

Rerun failed build that may be fixed in

https://reviews.llvm.org/rG4827492d9fcfe4ac5df4f319e935e33bec946195


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D97182/new/

https://reviews.llvm.org/D97182

Files:
  clang/CMakeLists.txt


Index: clang/CMakeLists.txt
===
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -262,7 +262,7 @@
 if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
   if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
 set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
+  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
 set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
   endif()
 endif()


Index: clang/CMakeLists.txt
===
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -262,7 +262,7 @@
 if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
   if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
 set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
+  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
 set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
   endif()
 endif()
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits


[PATCH] D97182: [clang] fix cmake wrong variable name from RTLIBS to RTLIB

2021-02-21 Thread Philip Lassen via Phabricator via cfe-commits
philass created this revision.
philass added a reviewer: chandlerc.
Herald added a subscriber: mgorny.
philass requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

RTSLIBS should instread be RTLIB

   if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
 if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
   set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
  -  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind") 
  +  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
   set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
 endif()
   endif()

Since CLANG_DEFAULT_RTLIBS should be CLANG_DEFAULT_RTLIB the line

  set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)

will never be reached.

This addresses `https://bugs.llvm.org/show_bug.cgi?id=48291`


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D97182

Files:
  clang/CMakeLists.txt


Index: clang/CMakeLists.txt
===
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -262,7 +262,7 @@
 if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
   if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
 set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
+  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
 set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
   endif()
 endif()


Index: clang/CMakeLists.txt
===
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -262,7 +262,7 @@
 if (CLANG_DEFAULT_UNWINDLIB STREQUAL "")
   if (CLANG_DEFAULT_RTLIB STREQUAL "libgcc")
 set (CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "" FORCE)
-  elseif (CLANG_DEFAULT_RTLIBS STREQUAL "libunwind")
+  elseif (CLANG_DEFAULT_RTLIB STREQUAL "libunwind")
 set (CLANG_DEFAULT_UNWINDLIB "none" CACHE STRING "" FORCE)
   endif()
 endif()
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits