Skip to content

Sync include flags #14957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Sync include flags #14957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,14 +1312,21 @@ fi

ZEND_INIT

dnl Prepend global include flags. The order of these flags is flexible, provided
dnl each build directory precedes its corresponding source directory. This
dnl enables developing in php-src using simultaneous in-source and out-of-source
dnl builds together with angled brackets inclusion style of generated headers.
dnl Note: The main is appended in front because of the <../main/php_config.h> in
dnl 'zend_config.h'. This ensures the correct 'php_config.h' is included,
dnl avoiding the inclusion of an unrelated 'build-dir/../main/php_config.h'.
PHP_ADD_INCLUDE([$abs_srcdir/Zend], [1])
PHP_ADD_INCLUDE([$abs_builddir/Zend], [1])
PHP_ADD_INCLUDE([$abs_srcdir/TSRM], [1])
PHP_ADD_INCLUDE([$abs_builddir/TSRM], [1])
PHP_ADD_INCLUDE([$abs_srcdir], [1])
PHP_ADD_INCLUDE([$abs_srcdir/main], [1])
PHP_ADD_INCLUDE([$abs_builddir], [1])
PHP_ADD_INCLUDE([$abs_srcdir/main], [1])
PHP_ADD_INCLUDE([$abs_builddir/main], [1])
PHP_ADD_INCLUDE([$abs_builddir/TSRM])
PHP_ADD_INCLUDE([$abs_builddir/Zend])
PHP_ADD_INCLUDE([$abs_srcdir/Zend])
PHP_ADD_INCLUDE([$abs_srcdir/TSRM])

ZEND_EXTRA_LIBS="$LIBS"
unset LIBS
Expand Down
2 changes: 1 addition & 1 deletion win32/build/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if (PHP_PREFIX == '') {
}
DEFINE('PHP_PREFIX', PHP_PREFIX);

DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM /I ext ");
DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM ");

toolset_setup_common_cflags();

Expand Down
Loading