Skip to content

Commit a355c35

Browse files
authored
Update and sync PHP build preprocessor macros help texts (#15298)
[skip ci]
1 parent a5c8342 commit a355c35

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

configure.ac

+10-6
Original file line numberDiff line numberDiff line change
@@ -1426,19 +1426,23 @@ EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
14261426

14271427
UNAME=`uname -a | xargs`
14281428
PHP_UNAME=${PHP_UNAME:-$UNAME}
1429-
AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output])
1429+
AC_DEFINE_UNQUOTED([PHP_UNAME], ["$PHP_UNAME"], [The 'uname -a' output.])
14301430
PHP_OS=`uname | xargs`
1431-
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
1431+
AC_DEFINE_UNQUOTED([PHP_OS], ["$PHP_OS"], [The 'uname' output.])
14321432
PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
1433-
AC_DEFINE_UNQUOTED(PHP_BUILD_SYSTEM,"$PHP_BUILD_SYSTEM",[builder uname output])
1433+
AC_DEFINE_UNQUOTED([PHP_BUILD_SYSTEM], ["$PHP_BUILD_SYSTEM"],
1434+
[The system that PHP was built on.])
14341435
if test -n "${PHP_BUILD_PROVIDER}"; then
1435-
AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider])
1436+
AC_DEFINE_UNQUOTED([PHP_BUILD_PROVIDER], ["$PHP_BUILD_PROVIDER"],
1437+
[The PHP build provider information.])
14361438
fi
14371439
if test -n "${PHP_BUILD_COMPILER}"; then
1438-
AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
1440+
AC_DEFINE_UNQUOTED([PHP_BUILD_COMPILER], ["$PHP_BUILD_COMPILER"],
1441+
[The compiler used for the PHP build.])
14391442
fi
14401443
if test -n "${PHP_BUILD_ARCH}"; then
1441-
AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
1444+
AC_DEFINE_UNQUOTED([PHP_BUILD_ARCH], ["$PHP_BUILD_ARCH"],
1445+
[The build architecture.])
14421446
fi
14431447

14441448
PHP_SUBST([PHP_FASTCGI_OBJS])

win32/build/confutils.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ extension_module_ptrs = "";
132132
var wmiservice = GetObject("winmgmts:{impersonationLevel=impersonate}!\\\\.\\root\\cimv2");
133133
var oss = wmiservice.ExecQuery("Select * from Win32_OperatingSystem");
134134
var os = oss.ItemIndex(0);
135-
AC_DEFINE("PHP_BUILD_SYSTEM", os.Caption + " [" + os.Version + "]", "Windows build system version");
135+
AC_DEFINE("PHP_BUILD_SYSTEM", os.Caption + " [" + os.Version + "]", "The system that PHP was built on.");
136136
var build_provider = WshShell.Environment("Process").Item("PHP_BUILD_PROVIDER");
137137
if (build_provider) {
138-
AC_DEFINE("PHP_BUILD_PROVIDER", build_provider);
138+
AC_DEFINE("PHP_BUILD_PROVIDER", build_provider, "The PHP build provider information.");
139139
}
140140
}());
141141

@@ -2945,25 +2945,25 @@ function toolset_setup_compiler()
29452945

29462946
WARNING("Using unknown MSVC version " + tmp);
29472947

2948-
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
2948+
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "The compiler used for the PHP build.");
29492949
DEFINE("PHP_COMPILER_SHORT", tmp);
29502950
AC_DEFINE('PHP_COMPILER_ID', tmp, "Compiler compatibility ID");
29512951
} else {
2952-
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
2952+
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "The compiler used for the PHP build.");
29532953
DEFINE("PHP_COMPILER_SHORT", COMPILER_NAME_SHORT.toLowerCase());
29542954
AC_DEFINE('PHP_COMPILER_ID', COMPILER_NAME_SHORT.toUpperCase(), "Compiler compatibility ID");
29552955
}
29562956
} else if (CLANG_TOOLSET) {
29572957
CLANGVERS = COMPILER_NUMERIC_VERSION;
29582958

2959-
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
2959+
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "The compiler used for the PHP build.");
29602960
DEFINE("PHP_COMPILER_SHORT", "clang");
29612961
AC_DEFINE('PHP_COMPILER_ID', "clang"); /* XXX something better were to write here */
29622962

29632963
} else if (ICC_TOOLSET) {
29642964
INTELVERS = COMPILER_NUMERIC_VERSION;
29652965

2966-
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "Detected compiler version");
2966+
AC_DEFINE('PHP_BUILD_COMPILER', COMPILER_NAME_LONG, "The compiler used for the PHP build.");
29672967
DEFINE("PHP_COMPILER_SHORT", "icc");
29682968
AC_DEFINE('PHP_COMPILER_ID', "icc"); /* XXX something better were to write here */
29692969
}
@@ -3185,7 +3185,7 @@ function toolset_target_arch()
31853185
function toolset_setup_arch()
31863186
{
31873187
STDOUT.WriteLine(" Detected " + TARGET_ARCH + " compiler" + (TARGET_ARCH == HOST_ARCH ? "" : " (cross compile from " + HOST_ARCH + ")"));
3188-
AC_DEFINE('PHP_BUILD_ARCH', TARGET_ARCH, "Detected compiler architecture");
3188+
AC_DEFINE('PHP_BUILD_ARCH', TARGET_ARCH, "The build architecture.");
31893189
DEFINE("PHP_ARCHITECTURE", TARGET_ARCH);
31903190
}
31913191

0 commit comments

Comments
 (0)