diff options
| author | Anatol Belski <ab@php.net> | 2017-08-19 00:31:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-08-19 00:31:55 +0200 |
| commit | 5ef63b6f0ea3f98537d6fba7ae28f7d1c3e6fbfd (patch) | |
| tree | 23e20785cc722dd56351c5f71589df497d402ffc | |
| parent | de0b816b49544cfdcbdf4add86db4427559b6989 (diff) | |
| parent | ba59b6f11bcbeb939359be5c567e877ed16ac8d4 (diff) | |
| download | php-git-5ef63b6f0ea3f98537d6fba7ae28f7d1c3e6fbfd.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix .pgd name for ts build
| -rw-r--r-- | win32/build/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 5389358787..41f7420fa6 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -80,8 +80,14 @@ sapi\phpdbg\phpdbg_lexer.c: sapi\phpdbg\phpdbg_lexer.l $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l !endif +!if "$(ZTS)" == "1" +PHP7_PGD_SUFFIX=ts +!else +PHP7_PGD_SUFFIX= +!endif + !if $(PGOMGR) != "" -PHP7_PGD_OPTION=/PGD:$(PGOPGD_DIR)\php7.pgd +PHP7_PGD_OPTION=/PGD:$(PGOPGD_DIR)\php7$(PHP7_PGD_SUFFIX).pgd !else PHP7_PGD_OPTION= !endif |