From 50e26928f41c98e7ee421e199d4ff347c98975ff Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 14 Aug 2017 09:26:44 -0400
Subject: [PATCH] Fix env creation in Makefile

The --user isn't a good idea at all to workaround Gentoo's patched pip.
---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5bd83dc1..47aae5c8 100644
--- a/Makefile
+++ b/Makefile
@@ -57,8 +57,11 @@ $(submodules_target) :
 env : | $(submodules_target) reqs
 ifndef NO_VENV
 	@echo "Creating our virtualenv"
-	${PYTHON} -m venv env --system-site-packages
-	$(VENV_PYTHON) -m pip install --user -r requirements.txt
+	${PYTHON} -m venv env
+	$(VENV_PYTHON) -m pip install -r requirements.txt
+# We can't use the "--system-site-packages" flag on creation because otherwise we end up with
+# the system's pip and that messes up things in some cases (notably in Gentoo).
+	${PYTHON} -m venv --upgrade --system-site-packages env
 endif
 
 build/help : | env