Restore removed emscripten includes in abseil-cpp

commit_hash:8dc6a399ad7e3cf95e20e1efdf0313c9173361ea

13 files changed, 17 insertions, 12 deletions

diff --git a/build/conf/sysincl.conf b/build/conf/sysincl.conf
index 8945843f6c9..ce34f83e4c6 100644
--- a/build/conf/sysincl.conf
+++ b/build/conf/sysincl.conf
@@ -97,6 +97,9 @@ when ($USE_ARCADIA_COMPILER_RUNTIME == "no") {
 when ($OS_EMSCRIPTEN) {
     SYSINCL+=build/sysincl/emscripten.yml
 }
+otherwise {
+    SYSINCL+=build/sysincl/emscripten-to-nothing.yml
+}
 
 when ($CUDA_VERSION == "10.2") {
     SYSINCL+=build/sysincl/nvidia-cub-1.8.0.yml
diff --git a/build/sysincl/emscripten-to-nothing.yml b/build/sysincl/emscripten-to-nothing.yml
new file mode 100644
index 00000000000..30edef0e4c5
--- /dev/null
+++ b/build/sysincl/emscripten-to-nothing.yml
@@ -0,0 +1,4 @@
+- includes:
+    - emscripten.h
+    - emscripten/console.h
+    - emscripten/version.h
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h b/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
index dce0ab09a5a..19b7b71c7a7 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/config.h
@@ -975,7 +975,7 @@ static_assert(Y_ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #error Y_ABSL_INTERNAL_EMSCRIPTEN_VERSION cannot be directly set
 #endif
 #ifdef __EMSCRIPTEN__
-#error #include <emscripten/version.h>
+#include <emscripten/version.h>
 #ifdef __EMSCRIPTEN_major__
 #if __EMSCRIPTEN_minor__ >= 1000
 #error __EMSCRIPTEN_minor__ is too big to fit in Y_ABSL_INTERNAL_EMSCRIPTEN_VERSION
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging.cc
index 7ddf743de3f..75534f157ba 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/base/internal/raw_logging.cc
@@ -22,7 +22,7 @@
 #include <util/generic/string.h>
 
 #ifdef __EMSCRIPTEN__
-#error #include <emscripten/console.h>
+#include <emscripten/console.h>
 #endif
 
 #include "y_absl/base/attributes.h"
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_emscripten-inl.inc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_emscripten-inl.inc
index ea86e5b0e10..e1c46233acc 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_emscripten-inl.inc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/internal/stacktrace_emscripten-inl.inc
@@ -20,7 +20,7 @@
 #ifndef Y_ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_
 #define Y_ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_
 
-#error #include <emscripten.h>
+#include <emscripten.h>
 
 #include <atomic>
 #include <cstring>
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize_emscripten.inc b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize_emscripten.inc
index 558160f9705..c6f07f1a5e0 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize_emscripten.inc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/debugging/symbolize_emscripten.inc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <cxxabi.h>
-#error #include <emscripten.h>
+#include <emscripten.h>
 
 #include <algorithm>
 #include <cstring>
diff --git a/contrib/restricted/abseil-cpp-tstring/y_absl/log/internal/globals.cc b/contrib/restricted/abseil-cpp-tstring/y_absl/log/internal/globals.cc
index 5ee68c2f45a..84ec102d443 100644
--- a/contrib/restricted/abseil-cpp-tstring/y_absl/log/internal/globals.cc
+++ b/contrib/restricted/abseil-cpp-tstring/y_absl/log/internal/globals.cc
@@ -18,7 +18,7 @@
 #include <cstdio>
 
 #if defined(__EMSCRIPTEN__)
-#error #include <emscripten/console.h>
+#include <emscripten/console.h>
 #endif
 
 #include "y_absl/base/attributes.h"
diff --git a/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py b/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py
index e7c7f6d2550..8ffd340d627 100644
--- a/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py
+++ b/contrib/restricted/abseil-cpp/.yandex_meta/__init__.py
@@ -102,8 +102,6 @@ abseil_cpp = CMakeNinjaNixProject(
     arcdir="contrib/restricted/abseil-cpp",
     nixattr="abseil-cpp",
     disable_includes=[
-        "emscripten.h",
-        "emscripten/*.h",
         # if defined(__myriad2__)
         "rtems.h",
         # if defined(__Fuchsia__)
diff --git a/contrib/restricted/abseil-cpp/absl/base/config.h b/contrib/restricted/abseil-cpp/absl/base/config.h
index 10747bc5f78..46e6fbcb9b2 100644
--- a/contrib/restricted/abseil-cpp/absl/base/config.h
+++ b/contrib/restricted/abseil-cpp/absl/base/config.h
@@ -968,7 +968,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != 'h' ||
 #error ABSL_INTERNAL_EMSCRIPTEN_VERSION cannot be directly set
 #endif
 #ifdef __EMSCRIPTEN__
-#error #include <emscripten/version.h>
+#include <emscripten/version.h>
 #ifdef __EMSCRIPTEN_major__
 #if __EMSCRIPTEN_minor__ >= 1000
 #error __EMSCRIPTEN_minor__ is too big to fit in ABSL_INTERNAL_EMSCRIPTEN_VERSION
diff --git a/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc b/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc
index 6f68002a3cb..d32b40a8bb7 100644
--- a/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc
+++ b/contrib/restricted/abseil-cpp/absl/base/internal/raw_logging.cc
@@ -22,7 +22,7 @@
 #include <string>
 
 #ifdef __EMSCRIPTEN__
-#error #include <emscripten/console.h>
+#include <emscripten/console.h>
 #endif
 
 #include "absl/base/attributes.h"
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
index 16522102f64..0f444514386 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/internal/stacktrace_emscripten-inl.inc
@@ -20,7 +20,7 @@
 #ifndef ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_
 #define ABSL_DEBUGGING_INTERNAL_STACKTRACE_EMSCRIPTEN_INL_H_
 
-#error #include <emscripten.h>
+#include <emscripten.h>
 
 #include <atomic>
 #include <cstring>
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc b/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc
index 925cbb9b2ac..a0f344dd9b5 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc
+++ b/contrib/restricted/abseil-cpp/absl/debugging/symbolize_emscripten.inc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <cxxabi.h>
-#error #include <emscripten.h>
+#include <emscripten.h>
 
 #include <algorithm>
 #include <cstring>
diff --git a/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc b/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc
index 47896923108..359858f15ef 100644
--- a/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc
+++ b/contrib/restricted/abseil-cpp/absl/log/internal/globals.cc
@@ -18,7 +18,7 @@
 #include <cstdio>
 
 #if defined(__EMSCRIPTEN__)
-#error #include <emscripten/console.h>
+#include <emscripten/console.h>
 #endif
 
 #include "absl/base/attributes.h"