mirror of
https://github.com/php/php-src.git
synced 2024-09-24 03:17:26 +00:00
- expose PHP_BUILD in the Makefile
- ICU 3.8/4.0 are dynamically linked, add $PHP_BUILD\bin to the PATH so php.exe can find them (nmake test, nmake snaps)
This commit is contained in:
parent
2fc3a87410
commit
a2e64a999e
@ -22,6 +22,7 @@ LD="$(LINK)"
|
||||
MC="$(MC)"
|
||||
MT="$(MT)"
|
||||
RE2C="$(RE2C)"
|
||||
PHP_BUILD=$(PHP_BUILD)
|
||||
|
||||
MCFILE=$(BUILD_DIR)\wsyslog.rc
|
||||
|
||||
@ -118,6 +119,7 @@ $(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php $(TEST
|
||||
<<NOKEEP
|
||||
|
||||
build-snap: generated_files
|
||||
SET PATH=$(PATH);$(PHP_BUILD)\bin
|
||||
@$(MAKE) "$(BUILD_DIR)\$(PHPDLL)"
|
||||
-for %T in ($(SAPI_TARGETS)) do $(MAKE) /I /nologo "%T"
|
||||
-for %T in ($(EXT_TARGETS)) do $(MAKE) /I /nologo "%T"
|
||||
|
@ -234,6 +234,7 @@ if (PHP_PHP_BUILD == 'no') {
|
||||
}
|
||||
}
|
||||
}
|
||||
DEFINE("PHP_BUILD", PHP_PHP_BUILD);
|
||||
|
||||
ARG_WITH('extra-includes', 'Extra include path to use when building everything', '');
|
||||
ARG_WITH('extra-libs', 'Extra library path to use when linking everything', '');
|
||||
|
Loading…
Reference in New Issue
Block a user