simd-team/work-ts
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mix-objects: inline linkenv

Browse Source
This commit is contained in:
Yingchi Long
2024-06-19 21:20:22 +08:00
parent a1450b36df
commit 10096bd147
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mix-object.ts
View File

@@ -27,13 +27,6 @@ function mkPop2Bench(spec: SPEC): Bench & Linkable {
async link(objectPath) { async link(objectPath) {
// Set up environment variables. // Set up environment variables.
// FIXME: use -rpath or -rpath-link after I find out why. // FIXME: use -rpath or -rpath-link after I find out why.
const linkenv = { ...process.env };
linkenv.LD_LIBRARY_PATH = [
path.join(PREFIX, 'lib'),
path.join(SYSROOT_PREFIX, 'lib'),
path.join(SYSROOT_PREFIX, 'usr', 'lib')
].join(':');
const objects = objectPath(base.benchData().objectNames); const objects = objectPath(base.benchData().objectNames);
const options = [ const options = [
@@ -51,7 +44,14 @@ function mkPop2Bench(spec: SPEC): Bench & Linkable {
// Execute the link command // Execute the link command
const proc = checkedSpawnSync(FLANG, options, { const proc = checkedSpawnSync(FLANG, options, {
stdio: "inherit", stdio: "inherit",
env: linkenv, env: {
...process.env,
LD_LIBRARY_PATH: [
path.join(PREFIX, 'lib'),
path.join(SYSROOT_PREFIX, 'lib'),
path.join(SYSROOT_PREFIX, 'usr', 'lib')
].join(':')
},
}); });
if (proc.error) { if (proc.error) {