Skip to content

Commit f2e7ca8

Browse files
committed
Extensions should have the final say on their compiler flags
1 parent 555e7ec commit f2e7ca8

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

build/php.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ ifelse($1,shared,[
218218
])
219219

220220
dnl
221-
dnl PHP_ADD_SOURCES_X(source-path, sources[, special-flags[, target-var[, shared[, special-post-flags]]]])
221+
dnl PHP_ADD_SOURCES_X(source-path, sources[, special-flags[, target-var[, shared]]])
222222
dnl
223223
dnl Additional to PHP_ADD_SOURCES (see above), this lets you set the name of the
224224
dnl array target-var directly, as well as whether shared objects will be built
@@ -251,10 +251,10 @@ dnl Append to the array which has been dynamically chosen at m4 time.
251251
252252
dnl Choose the right compiler/flags/etc. for the source-file.
253253
case $ac_src in
254-
*.c[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;;
255-
*.s[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;;
256-
*.S[)] ac_comp="$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_c_post" ;;
257-
*.cpp|*.cc|*.cxx[)] ac_comp="$b_cxx_pre $3 $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_cxx_post" ;;
254+
*.c[)] ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $3 $b_c_post" ;;
255+
*.s[)] ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $3 $b_c_post" ;;
256+
*.S[)] ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $3 $b_c_post" ;;
257+
*.cpp|*.cc|*.cxx[)] ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $3 $b_cxx_post" ;;
258258
esac
259259
260260
dnl Create a rule for the object/source combo.

0 commit comments

Comments
 (0)