From 3e2009199cc40c37d4cb139543a585df53efdb19 Mon Sep 17 00:00:00 2001
From: Sergey Bugaev <bugaevc@gmail.com>
Date: Mon, 2 Jan 2017 01:09:30 +0300
Subject: [PATCH] Only use DPREFIX in the 'darling' executable, unset it for
 everything else

---
 src/dyld/darling.c        | 4 +---
 src/dyld/dirstructure.cpp | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/dyld/darling.c b/src/dyld/darling.c
index 7fb396891..915dfb6e7 100644
--- a/src/dyld/darling.c
+++ b/src/dyld/darling.c
@@ -70,7 +70,7 @@ int main(int argc, const char** argv)
 		prefix = defaultPrefixPath();
 	if (!prefix)
 		return 1;
-	setenv("DPREFIX", prefix, 0);
+	unsetenv("DPREFIX");
 
 	if (!checkPrefixDir())
 		setupPrefix();
@@ -244,8 +244,6 @@ void setupChild(const char *curPath)
 	char buffer1[4096];
 	char buffer2[4096];
 
-	setenv("DPREFIX", "/", 1);
-
 	setenv("PATH",
 		"/usr/bin:"
 		"/bin:"
diff --git a/src/dyld/dirstructure.cpp b/src/dyld/dirstructure.cpp
index 92b338d2f..1948f5ea5 100644
--- a/src/dyld/dirstructure.cpp
+++ b/src/dyld/dirstructure.cpp
@@ -33,12 +33,11 @@ static std::string GetUserLibrary()
 	std::stringstream ss;
 	std::string path;
 
-	prefix = getenv("DPREFIX");
 	home = getenv("HOME");
-	if (!prefix || !home)
+	if (!home)
 		return std::string(); // give up on this user
 
-	ss << prefix << home << '/' << "Library" << '/';
+	ss << home << '/' << "Library" << '/';
 	return ss.str();
 }
 
-- 
2.51.2