summaryrefslogtreecommitdiffstats
path: root/patches/0001-Mac-Do-not-modify-the-child-path.patch
blob: c4b538e6a13ab14d3a0ea9eb11a2b1fa5f4db862 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
From 19d0958dc151847b994c352fdffd2844bec20b43 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Sat, 29 Jun 2013 22:39:29 +0200
Subject: [PATCH] [Mac] Do not modify the child path.

We currently only have a single process binary for Qt.
Therefore we should not choose a different binary based on required privileges.
However, this patch can only be a preliminary solution.
May be we should instead implement our own ChildProcessHost.
---
 content/common/child_process_host_impl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 2dfab2f..3f53266 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -106,7 +106,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) {
   if (child_path.empty())
     PathService::Get(CHILD_PROCESS_EXE, &child_path);
 
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) && 0
   DCHECK(!(flags & CHILD_NO_PIE && flags & CHILD_ALLOW_HEAP_EXECUTION));
 
   // If needed, choose an executable with special flags set that inform the
-- 
1.7.12.4 (Apple Git-37)