summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--premake5.lua9
1 files changed, 8 insertions, 1 deletions
diff --git a/premake5.lua b/premake5.lua
index 20dc6557c..dcbc4c8af 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -179,7 +179,14 @@ newoption {
enableEmbedStdLib = (_OPTIONS["enable-embed-stdlib"] == "true")
enableXlib = (_OPTIONS["enable-xlib"] == "true")
enableExperimental = (_OPTIONS["enable-experimental-projects"] == "true")
- disableStdlibSource = (_OPTIONS["disable-stdlib-source"] == "true")
+
+ -- If stdlib embedding is enabled, disable stdlib source embedding by default
+ disableStdlibSource = enableEmbedStdLib
+
+ -- If embedding is enabled, and the setting `disable-stdlib-source` setting is set, use it's value
+ if enableEmbedStdLib and _OPTIONS["disable-stdlib-source"] ~= nil then
+ disableStdlibSource = (_OPTIONS["disable-stdlib-source"] == "true")
+ end
-- Determine the target info