Skip to content

Commit d3e74fb

Browse files
committed
move re2c thingy
1 parent c966485 commit d3e74fb

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/SPC/toolchain/ToolchainManager.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,5 @@ public static function afterInitToolchain(): void
7373
if (getenv('PHP_BUILD_COMPILER') === false && ($compiler_info = $instance->getCompilerInfo())) {
7474
GlobalEnvManager::putenv("PHP_BUILD_COMPILER={$compiler_info}");
7575
}
76-
if (getenv('RE2C') === false) {
77-
// php 8.5 needs RE2C defined
78-
$re2c = SystemUtil::findCommand('re2c') ?: BUILD_BIN_PATH . '/re2c';
79-
GlobalEnvManager::putenv("RE2C={$re2c}");
80-
}
8176
}
8277
}

src/SPC/util/GlobalEnvManager.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public static function init(): void
4646
} else {
4747
self::putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
4848
}
49+
50+
if (getenv('RE2C') === false) {
51+
// php 8.5 needs RE2C defined
52+
$re2c = SystemUtil::findCommand('re2c') ?: BUILD_BIN_PATH . '/re2c';
53+
GlobalEnvManager::putenv("RE2C={$re2c}");
54+
}
4955
}
5056

5157
$ini = self::readIniFile();

0 commit comments

Comments
 (0)