Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0: Fix .pgd name for ts build
fabpot · Aug 18, 2017 · 5ef63b6 · 5ef63b6
2 parents de0b816 + ba59b6f
commit 5ef63b6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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