Skip to content

Commit

Permalink
add linux env var: SPC_NO_MUSL_PATH (#437)
Browse files Browse the repository at this point in the history
  • Loading branch information
crazywhalecc authored May 6, 2024
1 parent e1e6270 commit 69e6d82
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/SPC/util/GlobalEnvManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ private static function initLinuxEnv(BuilderBase $builder): void
self::initIfNotExists('CXX', "{$arch}-linux-musl-g++");
self::initIfNotExists('AR', "{$arch}-linux-musl-ar");
self::initIfNotExists('LD', 'ld.gold');
self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
if (getenv('SPC_NO_MUSL_PATH') !== 'yes') {
self::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
}
}

// Init arch-specific cflags
Expand All @@ -106,12 +108,11 @@ private static function initLinuxEnv(BuilderBase $builder): void
'SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS' => getenv('SPC_DEFAULT_C_FLAGS'),
'SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
'SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS' => '-L' . BUILD_LIB_PATH,
'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread',
'SPC_CMD_VAR_PHP_CONFIGURE_LIBS' => '-ldl -lpthread -lm',
'SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS' => $php_extra_cflags_optimize . ' -fno-ident -fPIE',
'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS' => '',
'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM' => $clang_use_lld . '-all-static',
];

foreach ($init_spc_cmd_maps as $name => $value) {
self::initIfNotExists($name, $value);
}
Expand Down

0 comments on commit 69e6d82

Please sign in to comment.