From af331cd9eefe0507f1eaf92d726512d04dbf2b97 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Sun, 12 Jun 2022 20:20:04 -0400
Subject: 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.
---
 premake5.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'premake5.lua')

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
 
-- 
cgit v1.2.3