From 1bc794845317c952a5167936f9087e99b86bd0cb Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 14 Dec 2020 16:18:51 -0500 Subject: Enable embedding stdlib for github builds (#1640) * #include an absolute path didn't work - because paths were taken to always be relative. * Enable building with embedding stdlib. --- .github/workflows/release-windows.yml | 2 +- .github/workflows/windows.yml | 2 +- github_build.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml index 15b164efc..ac0d90ee6 100644 --- a/.github/workflows/release-windows.yml +++ b/.github/workflows/release-windows.yml @@ -23,7 +23,7 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: premake run: - .\premake.bat vs2017 + .\premake.bat vs2017 --enable-embed-stdlib=true - name: msbuild run: MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d01a4ba93..4f871a6c0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,7 +24,7 @@ jobs: uses: microsoft/setup-msbuild@v1 - name: premake run: - .\premake.bat vs2017 + .\premake.bat vs2017 --enable-embed-stdlib=true - name: build run: MSBuild.exe slang.sln -v:m -m -property:Configuration=${{matrix.configuration}} -property:Platform=${{matrix.platform}} -property:WindowsTargetPlatformVersion=10.0.19041.0 diff --git a/github_build.sh b/github_build.sh index 445b04b19..ff76bf65e 100644 --- a/github_build.sh +++ b/github_build.sh @@ -8,7 +8,7 @@ git describe --tags | sed -e "s/\(.*\)/\#define SLANG_TAG_VERSION \"\1\"/" > sla cat slang-tag-version.h # Create the makefile -./premake5 gmake --cc=${CC} +./premake5 gmake --cc=${CC} --enable-embed-stdlib=true # Build the configuration make config=${CONFIGURATION}_x64 -j`nproc` -- cgit v1.2.3