From 325f7b6008a4a10e9b0f1c69ee4518b0669461be Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Sun, 7 Jul 2019 20:16:57 -0700 Subject: Make pkg_config in mkmf include -I cflags in return value This was the historical behavior, it was modified unintentionally by 097c3e9cbbf23718371f08c24b2d2297b039f63f, 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] --- lib/mkmf.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/mkmf.rb') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index bf95484aa8..692ceb43a9 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1801,7 +1801,7 @@ SRC # # Where {option} is, for instance, --cflags. # - # The values obtained are appended to +$CFLAGS+, +$LDFLAGS+ and + # The values obtained are appended to +$INCFLAGS+, +$CFLAGS+, +$LDFLAGS+ and # +$libs+. # # If an option 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 -- cgit v1.2.3