From: Jan Vorlicek <janvorli@microsoft.com>
Date: Wed, 6 Nov 2019 04:58:12 +0000 (+0100)
Subject: Fix intermittent arm/arm64 Linux build failures (dotnet/coreclr#27698)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2b1a33d28e21fc5a35aaaecf0ef7df8bc8c7475;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fix intermittent arm/arm64 Linux build failures (dotnet/coreclr#27698)

The arm/arm64 Linux builds were recently failing intermittently
with a weird error in macro expansion in one of the generated
eventing headers. It seems that the issue is caused by the fact
that we were not creating a custom_target to enable handling
dependencies on the generated header files and we were also
not marking the files as generated.
I've noticed that the message indicating that the headers are
being generated was printed twice in the build log. with this
fix, it occurs only once there.
So I believe that the issue was caused by the headers being
generated twice by two different threads and when that happened,
the files got corrupted.

Commit migrated from https://github.com/dotnet/coreclr/commit/7cf41c0fb1b916057aa5beeac57d6195878740cc
---

diff --git a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt
index 1e6c8112b5a..b9e4f1574b8 100644
--- a/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt
+++ b/src/coreclr/src/pal/src/eventprovider/lttngprovider/CMakeLists.txt
@@ -40,17 +40,28 @@ add_custom_command(OUTPUT ${LTTNG_PROVIDER_SOURCES} ${TRACEPOINT_PROVIDER_SOURCE
   COMMAND ${GENERATE_COMMAND}
   DEPENDS ${EVENT_MANIFEST} ${GENERATE_SCRIPT})
 
+set_source_files_properties(
+  ${LTTNG_PROVIDER_SOURCES} ${TRACEPOINT_PROVIDER_SOURCES} ${LTTNG_HEADERS}
+  PROPERTIES GENERATED TRUE)
+
+add_custom_target(
+  generated_eventing_headers
+  DEPENDS ${LTTNG_HEADERS})
+
 add_library(eventprovider
-    STATIC
-    ${LTTNG_PROVIDER_SOURCES}
-    eventproviderhelpers.cpp
+  STATIC
+  ${LTTNG_PROVIDER_SOURCES}
+  eventproviderhelpers.cpp
 )
 
 add_library(coreclrtraceptprovider
-    SHARED
-    ${TRACEPOINT_PROVIDER_SOURCES}
+  SHARED
+  ${TRACEPOINT_PROVIDER_SOURCES}
 )
 
+add_dependencies(eventprovider generated_eventing_headers)
+add_dependencies(coreclrtraceptprovider generated_eventing_headers)
+
 find_library(LTTNG NAMES lttng-ust)
 
 target_link_libraries(coreclrtraceptprovider