archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix phpize build when DEFINE() is involved
This commit is contained in:
Anatol Belski 2018-03-26 13:38:55 +02:00
commit 35f832a007
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
win32/build/confutils.js
View file

@ -1503,7 +1503,11 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')');
}
if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
if (MODE_PHPIZE) {
if (!FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
var _tmp = FSO.CreateTextFile(PHP_DIR + "/include/main/config.pickle.h", true);
_tmp.Close();
}
cflags = "/FI main/config.pickle.h " + cflags;
}
ADD_FLAG("CFLAGS_" + EXT, cflags);