Skip to content

Commit eae7f34

Browse files
committed
chore: wip
1 parent e0d251a commit eae7f34

File tree

1 file changed

+25
-1
lines changed

1 file changed

+25
-1
lines changed

scripts/build-php.ts

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2463,7 +2463,20 @@ exec ./configure "$@"
24632463
execSync(`make -j${maxJobs}`, {
24642464
stdio: 'inherit',
24652465
cwd: phpSourceDir,
2466-
env: buildEnv,
2466+
env: {
2467+
...process.env,
2468+
...buildEnv,
2469+
// Ensure proper working directory context for GitHub Actions
2470+
PWD: phpSourceDir,
2471+
// Fix potential permission issues in GitHub Actions
2472+
TMPDIR: process.env.TMPDIR || '/tmp',
2473+
// Ensure consistent linker behavior across environments
2474+
MACOSX_DEPLOYMENT_TARGET: '10.15',
2475+
// Ensure make has proper paths
2476+
PATH: buildEnv.PATH || process.env.PATH || '/usr/local/bin:/usr/bin:/bin',
2477+
// Force proper shell for make commands
2478+
SHELL: '/bin/bash',
2479+
},
24672480
timeout: 45 * 60 * 1000, // 45 minutes timeout
24682481
})
24692482
}
@@ -2574,7 +2587,18 @@ exec ./configure "$@"
25742587
stdio: 'inherit',
25752588
cwd: phpSourceDir,
25762589
env: {
2590+
...process.env,
25772591
...installEnv,
2592+
// Ensure proper working directory context for GitHub Actions
2593+
PWD: phpSourceDir,
2594+
// Fix potential permission issues in GitHub Actions
2595+
TMPDIR: process.env.TMPDIR || '/tmp',
2596+
// Ensure consistent linker behavior across environments
2597+
MACOSX_DEPLOYMENT_TARGET: '10.15',
2598+
// Ensure make has proper paths
2599+
PATH: installEnv.PATH || process.env.PATH || '/usr/local/bin:/usr/bin:/bin',
2600+
// Force proper shell for make commands
2601+
SHELL: '/bin/bash',
25782602
DESTDIR: '', // Ensure DESTDIR is empty so prefix is used directly
25792603
INSTALL_ROOT: '' // Also ensure INSTALL_ROOT doesn't interfere
25802604
},

0 commit comments

Comments
 (0)