[PATCH] D142690: [DRAFT][libc++] Fixes the Clang modular build.

[Mark de Wever via Phabricator via cfe-commits]

Mordante updated this revision to Diff 492648.
Mordante added a comment.
Herald added a subscriber: arichardson.

Fix CI run instead of libc++.


Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D142690

Files:
  clang/lib/run_the_clang_CI
  libcxx/include/module.modulemap.in
  libcxx/utils/ci/generate-buildkite-pipeline


Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -19,7 +19,7 @@
   CLANG_CHANGED=true
 fi
 
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
+if [[ "${CLANG_CHANGED}" == "true" ]]; then
   cat libcxx/utils/ci/buildkite-pipeline-clang.yml
 else
   cat libcxx/utils/ci/buildkite-pipeline.yml
Index: libcxx/include/module.modulemap.in
===================================================================
--- libcxx/include/module.modulemap.in
+++ libcxx/include/module.modulemap.in
@@ -1416,7 +1416,10 @@
     module extent                              { private header 
"__type_traits/extent.h" }
     module has_unique_object_representation    { private header 
"__type_traits/has_unique_object_representation.h" }
     module has_virtual_destructor              { private header 
"__type_traits/has_virtual_destructor.h" }
-    module integral_constant                   { private header 
"__type_traits/integral_constant.h" }
+    module integral_constant                   {
+      private header "__type_traits/integral_constant.h"
+      export type_traits.common_reference
+    }
     module is_abstract                         { private header 
"__type_traits/is_abstract.h" }
     module is_aggregate                        { private header 
"__type_traits/is_aggregate.h" }
     module is_allocator                        { private header 
"__type_traits/is_allocator.h" }



Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -19,7 +19,7 @@
   CLANG_CHANGED=true
 fi
 
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
+if [[ "${CLANG_CHANGED}" == "true" ]]; then
   cat libcxx/utils/ci/buildkite-pipeline-clang.yml
 else
   cat libcxx/utils/ci/buildkite-pipeline.yml
Index: libcxx/include/module.modulemap.in
===================================================================
--- libcxx/include/module.modulemap.in
+++ libcxx/include/module.modulemap.in
@@ -1416,7 +1416,10 @@
     module extent                              { private header "__type_traits/extent.h" }
     module has_unique_object_representation    { private header "__type_traits/has_unique_object_representation.h" }
     module has_virtual_destructor              { private header "__type_traits/has_virtual_destructor.h" }
-    module integral_constant                   { private header "__type_traits/integral_constant.h" }
+    module integral_constant                   {
+      private header "__type_traits/integral_constant.h"
+      export type_traits.common_reference
+    }
     module is_abstract                         { private header "__type_traits/is_abstract.h" }
     module is_aggregate                        { private header "__type_traits/is_aggregate.h" }
     module is_allocator                        { private header "__type_traits/is_allocator.h" }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits