Merge pull request #616 from ruby/fix-libyaml-host-name

hsbt · web-flow · commit 482f442b2244 · 2023-01-17T17:26:17.000+09:00
configure of libyaml couldn't detect "arm64-apple-darwin22" for build host
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
@@ -22,7 +22,7 @@
   args = [
     yaml_configure,
     "--enable-#{shared ? 'shared' : 'static'}",
-    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
+    "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-').sub(/arm64/, 'arm')}",
     "CC=#{RbConfig::CONFIG['CC']}",
     *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
   ]

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`args = [`
`23`	`23`	`yaml_configure,`
`24`	`24`	`"--enable-#{shared ? 'shared' : 'static'}",`
`25`		`- "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",`
	`25`	`+ "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-').sub(/arm64/, 'arm')}",`
`26`	`26`	`"CC=#{RbConfig::CONFIG['CC']}",`
`27`	`27`	`*(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),`
`28`	`28`	`]`