Commit 2902c967 authored by Ben Cooksley's avatar Ben Cooksley

When on Linux/*BSD systems (aside from macOS) make sure we include the...

When on Linux/*BSD systems (aside from macOS) make sure we include the standard system install directory (/usr) in our environment.
As we are setting many variables, defaults that would include /usr normally when these variables aren't set won't kick in, so we have to explicitly include them
parent 14ebcf2b
......@@ -21,6 +21,12 @@ def generateFor( installPrefix ):
# As well as it's dev-utils directory (why it's split up like this - no clue...)
envChanges = changesForPrefix( "C:/Craft/dev-utils/", envChanges )
# Are we on a Non-Windows / Mac platform?
if sys.platform != 'win32' and sys.platform != 'darwin':
# The we need to consider the system install prefix
# Normally these would be setup for us, but this is just to be absolutely sure everything is right
envChanges = changesForPrefix( "/usr/", envChanges )
# Now we can merge this into the real environment
splitChar = separatorCharacter()
clonedEnv = copy.deepcopy(os.environ)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment