зеркало из https://github.com/github/ruby.git
Make pkg_config in mkmf include -I cflags in return value
This was the historical behavior, it was modified unintentionally
by 097c3e9cbb
, which started storing
these flags in a different global variable.
Also, include the incflags when logging, and document that the
method modifies $INCFLAGS.
Fixes [Bug #10651]
This commit is contained in:
Родитель
b6f07f748a
Коммит
325f7b6008
|
@ -1801,7 +1801,7 @@ SRC
|
|||
#
|
||||
# Where {option} is, for instance, <code>--cflags</code>.
|
||||
#
|
||||
# The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and
|
||||
# The values obtained are appended to +$INCFLAGS+, +$CFLAGS+, +$LDFLAGS+ and
|
||||
# +$libs+.
|
||||
#
|
||||
# If an <code>option</code> argument is given, the config command is
|
||||
|
@ -1857,9 +1857,9 @@ SRC
|
|||
|
||||
$LDFLAGS = [orig_ldflags, ldflags].join(' ')
|
||||
Logging::message "package configuration for %s\n", pkg
|
||||
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
|
||||
cflags, ldflags, libs
|
||||
[cflags, ldflags, libs]
|
||||
Logging::message "incflags: %s\ncflags: %s\nldflags: %s\nlibs: %s\n\n",
|
||||
incflags, cflags, ldflags, libs
|
||||
[[incflags, cflags].join(' '), ldflags, libs]
|
||||
else
|
||||
Logging::message "package configuration for %s is not found\n", pkg
|
||||
nil
|
||||
|
|
Загрузка…
Ссылка в новой задаче