forked from pool/nodejs-electron
Dominik Heidler
52df3eda55
Package Electron 20. Please check if it works with element-desktop (my prior is that it should as upstream already uses this version) OBS-URL: https://build.opensuse.org/request/show/1005070 OBS-URL: https://build.opensuse.org/package/show/devel:languages:nodejs/nodejs-electron?expand=0&rev=33
15 lines
689 B
Diff
15 lines
689 B
Diff
Index: electron-17.1.0/base/compiler_specific.h
|
|
===================================================================
|
|
--- electron-17.1.0.orig/base/compiler_specific.h 2022-03-07 17:20:29.460807562 +0100
|
|
+++ electron-17.1.0/base/compiler_specific.h 2022-03-09 08:28:51.902933750 +0100
|
|
@@ -366,7 +366,8 @@ inline constexpr bool AnalyzerAssumeTrue
|
|
#endif // defined(__clang_analyzer__)
|
|
|
|
// Use nomerge attribute to disable optimization of merging multiple same calls.
|
|
-#if defined(__clang__) && HAS_ATTRIBUTE(nomerge)
|
|
+#if defined(__clang__) && (__clang_major__ >= 12) && \
|
|
+ __has_attribute(nomerge) && !defined(OS_CHROMEOS)
|
|
#define NOMERGE [[clang::nomerge]]
|
|
#else
|
|
#define NOMERGE
|