diff options
Diffstat (limited to 'packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch')
-rw-r--r-- | packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch b/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch new file mode 100644 index 0000000000..47b7f7c86f --- /dev/null +++ b/packaging/Fix-build-breakage-on-high-processsor-machines-12114.patch @@ -0,0 +1,55 @@ +From f14cffc86b49cb803a6ed8e5a864f8c0c7b87f33 Mon Sep 17 00:00:00 2001 +From: Omair Majid <omair.majid@gmail.com> +Date: Wed, 7 Jun 2017 00:19:48 -0400 +Subject: [PATCH] Fix build breakage on high-processsor machines (#12114) + +The build calls `make -j $NumProc`. This breaks on machines with a high +number of procesors (such as 25). + +To reproduce this on any machine, edit build.sh and change + + buildTool install -j $NumProc + +to + + buildTool install -j 100 + +The error trace looks like this: + + In file included from coreclr/bin/obj/Linux.x64.Debug/Generated/eventpipe/dotnetruntime.cpp:12: + In file included from coreclr/src/vm/common.h:306: + In file included from coreclr/src/vm/eepolicy.h:15: + In file included from coreclr/src/vm/vars.hpp:70: + In file included from coreclr/src/vm/eeprofinterfaces.h:19: + In file included from coreclr/src/inc/profilepriv.h:128: + In file included from coreclr/src/inc/profilepriv.inl:18: + In file included from coreclr/src/vm/eetoprofinterfaceimpl.h:23: + coreclr/src/inc/eventtracebase.h:306:10: fatal error: 'clretwallmain.h' file not found + +It turns out that the eventpipe code has a dependency on +clretwallmain.h. src/CMakeLists.txt points out that clretwallmain.h is a +generated file. But there's no actual dependency between the eventpipe +target and the header file(s). + +Fix that by fixing the generator script to insert an explicit dependency +between 'eventpipe' module and 'GeneratedEventingFiles' module. +--- + src/scripts/genEventPipe.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/scripts/genEventPipe.py b/src/scripts/genEventPipe.py +index a00511d..4c802ac 100644 +--- a/src/scripts/genEventPipe.py ++++ b/src/scripts/genEventPipe.py +@@ -262,6 +262,8 @@ def generateEventPipeCmakeFile(etwmanifest, eventpipe_directory): + topCmake.write(' "eventpipehelpers.cpp"\n') + topCmake.write(""" ) + ++ add_dependencies(eventpipe GeneratedEventingFiles) ++ + # Install the static eventpipe library + install(TARGETS eventpipe DESTINATION lib) + """) +-- +1.9.1 + |