diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-06-12 20:20:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-12 17:20:04 -0700 |
| commit | af331cd9eefe0507f1eaf92d726512d04dbf2b97 (patch) | |
| tree | 95a27165342d8f25aef037226aa29de9cec4446d | |
| parent | 4db6bd3cd6da1871fdac520c280bd9f933e48489 (diff) | |
Only disable stdlib source when stdlib embedding is enabled (#2268)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Only disable source, if there is stdlib embedding.
* Disable by default stdlib source embedding if stdlib binary embedding is enabled.
* Fix typo
* Improve comments.
| -rw-r--r-- | premake5.lua | 9 |
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 |