From 88bc8317d3c0245404dad25e5f10b6d7268c11bf Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Fri, 30 Jun 2023 23:25:34 +0200
Subject: [PATCH] Fix add-to-environment input
---
packed/index.js | 12 ++++++------
src/platform.ts | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/packed/index.js b/packed/index.js
index 3429f2c..33e62f5 100644
--- a/packed/index.js
+++ b/packed/index.js
@@ -741,17 +741,17 @@ function export_environent_variables(platform, prefix) {
core.addPath("".concat(prefix, "/bin"));
break;
case SdlBuildPlatform.Macos: {
- var libpath = process.env.DYLD_LIBRARY_PATH;
- if (libpath) {
- libpath = "`${prefix}`/lib:${libpath}";
+ var libpath = "".concat(prefix, "/lib");
+ if (process.env.DYLD_LIBRARY_PATH) {
+ libpath += ":".concat(process.env.DYLD_LIBRARY_PATH);
}
core.exportVariable("DYLD_LIBRARY_PATH", libpath);
break;
}
case SdlBuildPlatform.Linux: {
- var libpath = process.env.LD_LIBRARY_PATH;
- if (libpath) {
- libpath = "`${prefix}`/lib:${libpath}";
+ var libpath = "".concat(prefix, "/lib");
+ if (process.env.LD_LIBRARY_PATH) {
+ libpath += ":".concat(process.env.LD_LIBRARY_PATH);
}
core.exportVariable("LD_LIBRARY_PATH", libpath);
break;
diff --git a/src/platform.ts b/src/platform.ts
index 93df82a..16f031a 100644
--- a/src/platform.ts
+++ b/src/platform.ts
@@ -46,17 +46,17 @@ export function export_environent_variables(
core.addPath(`${prefix}/bin`);
break;
case SdlBuildPlatform.Macos: {
- let libpath = process.env.DYLD_LIBRARY_PATH;
- if (libpath) {
- libpath = "`${prefix}`/lib:${libpath}";
+ let libpath = `${prefix}/lib`;
+ if (process.env.DYLD_LIBRARY_PATH) {
+ libpath += `:${process.env.DYLD_LIBRARY_PATH}`;
}
core.exportVariable("DYLD_LIBRARY_PATH", libpath);
break;
}
case SdlBuildPlatform.Linux: {
- let libpath = process.env.LD_LIBRARY_PATH;
- if (libpath) {
- libpath = "`${prefix}`/lib:${libpath}";
+ let libpath = `${prefix}/lib`;
+ if (process.env.LD_LIBRARY_PATH) {
+ libpath += `:${process.env.LD_LIBRARY_PATH}`;
}
core.exportVariable("LD_LIBRARY_PATH", libpath);
break;