AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix --os overriding the target OS.

Browse Source
This commit is contained in:
Tom van Dijck 2017-07-31 16:41:41 -07:00
parent 5ecd0a3102
commit 4fc5827496
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/oven.lua
View File

@ -63,7 +63,7 @@
context.addFilter(self, "_ACTION", _ACTION)
context.addFilter(self, "action", _ACTION)
self.system = self.system or p.action.current().targetos or os.target()
self.system = self.system or os.target()
context.addFilter(self, "system", os.getSystemTags(self.system))
-- Add command line options to the filtering options
@ -204,7 +204,7 @@
-- Now filter on the current system and architecture, allowing the
-- values that might already in the context to override my defaults.
self.system = self.system or p.action.current().targetos or os.target()
self.system = self.system or os.target()
context.addFilter(self, "system", os.getSystemTags(self.system))
context.addFilter(self, "architecture", self.architecture)
context.addFilter(self, "tags", self.tags)
@ -529,7 +529,7 @@
-- More than a convenience; this is required to work properly with
-- external Visual Studio project files.
local system = p.action.current().targetos or os.target()
local system = os.target()
local architecture = nil
local toolset = p.action.current().toolset