diff options
author | nagachika <nagachika@ruby-lang.org> | 2021-05-22 16:27:29 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2021-05-22 16:27:29 +0900 |
commit | 5e21726cda22e3cb34127751aec7e9babb4308b3 (patch) | |
tree | 22de5cde98bc382b55cba4e7fa89e55603bcca02 | |
parent | ddd720f8dcd98de6a250a152fa40c3c044d62383 (diff) |
merge revision(s) 799ea1d1540aca03542ee31647052343507a4b41: [Backport #16651]
mkmf.rb: convert also arch_hdrdir [Bug #16651]
---
lib/mkmf.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-rw-r--r-- | lib/mkmf.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 672c5448fa..995934c4d6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1942,7 +1942,7 @@ NULLCMD = #{CONFIG['NULLCMD']} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}} topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace} hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace} -arch_hdrdir = #{$arch_hdrdir.quote} +arch_hdrdir = #{mkintpath($arch_hdrdir).unspace} PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} } @@ -12,7 +12,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 79 +#define RUBY_PATCHLEVEL 80 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 5 |