From b67271eeb27bfbf4ed8fa02f3e58d5e595b4ffc4 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Sat, 16 Jan 2016 03:57:27 +0000 Subject: [PATCH] [webkitdirs] Avoid list form of open because it broke WinCairo https://bugs.webkit.org/show_bug.cgi?id=153106 Patch by Konstantin Tokarev on 2016-01-15 Reviewed by Alex Christensen. * Scripts/webkitdirs.pm: (determineArchitecture): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195163 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 10 ++++++++++ Tools/Scripts/webkitdirs.pm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index ce01dfe..1f9bb8d 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,13 @@ +2016-01-15 Konstantin Tokarev + + [webkitdirs] Avoid list form of open because it broke WinCairo + https://bugs.webkit.org/show_bug.cgi?id=153106 + + Reviewed by Alex Christensen. + + * Scripts/webkitdirs.pm: + (determineArchitecture): + 2016-01-15 Simon Fraser Add kdebug_trace signposts for a few WebCore operations diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 7422f58..d0dc214 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -339,7 +339,7 @@ sub determineArchitecture } } elsif (isCMakeBuild()) { my $host_processor = ""; - if (open my $cmake_sysinfo, "-|", "cmake", "--system-information") { + if (open my $cmake_sysinfo, "cmake --system-information |") { while (<$cmake_sysinfo>) { next unless index($_, 'CMAKE_SYSTEM_PROCESSOR') == 0; if (/^CMAKE_SYSTEM_PROCESSOR \"([^"]+)\"/) { -- 1.8.3.1