diff options
| author | nagachika <nagachika@ruby-lang.org> | 2023-09-30 13:37:37 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2023-09-30 13:37:37 +0900 |
| commit | 5640baa2f82f528a092d92ceaabeb76c43c098ee (patch) | |
| tree | cae795bca46bb81274191be7065dac07c6bc7ac9 | |
| parent | e7ab923b880ac75862cf9c287ac8ecbcd8ed1a31 (diff) | |
merge revision(s) fe0225ff4d5af8b1f54009727b39d0d9b821eea3: [Backport #19778]
[Bug #19778] Add `-I` options for opt-dir to `$INCFLAGS`
These options have been separated from `$CFLAGS` already in the
other places.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1008811823..7a69f2e5ea 100644 --- a/configure.ac +++ b/configure.ac @@ -973,7 +973,7 @@ AS_IF([test "x$OPT_DIR" != x], [ LDFLAGS="${LDFLAGS:+$LDFLAGS }$val" DLDFLAGS="${DLDFLAGS:+$DLDFLAGS }$val" LDFLAGS_OPTDIR="$val" - CPPFLAGS="${CPPFLAGS:+$CPPFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' | + INCFLAGS="${INCFLAGS:+$INCFLAGS }"`echo "$OPT_DIR" | tr "${PATH_SEPARATOR}" '\012' | sed '/^$/d;s|^|-I|;s|$|/include|' | tr '\012' ' ' | sed 's/ *$//'` ]) @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 120 +#define RUBY_PATCHLEVEL 121 #include "ruby/version.h" #include "ruby/internal/abi.h" |