Skip to content

Commit cd91c43

Browse files
committed
Mirror configure.ac change, host "*-gnu".
1 parent 6088c5e commit cd91c43

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

Tools/configure/conf_platform.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ def setup_machdep(v):
3232
v.ac_sys_system = "iOS"
3333
elif pyconf.fnmatch(v.host, "*-*-darwin*"):
3434
v.ac_sys_system = "Darwin"
35+
elif pyconf.fnmatch(v.host, "*-gnu"):
36+
v.ac_sys_system = "GNU"
3537
elif pyconf.fnmatch(v.host, "*-*-vxworks*"):
3638
v.ac_sys_system = "VxWorks"
3739
elif pyconf.fnmatch(v.host, "*-*-emscripten"):
@@ -91,9 +93,7 @@ def setup_host_prefix(v):
9193
if not v.host_prefix:
9294
v.export(
9395
"host_prefix",
94-
"/"
95-
if v.ac_sys_system == "Emscripten"
96-
else "${prefix}",
96+
"/" if v.ac_sys_system == "Emscripten" else "${prefix}",
9797
)
9898

9999
if not v.host_exec_prefix:
@@ -133,6 +133,8 @@ def setup_host_platform(v):
133133
host_ident = f"{v.IPHONEOS_DEPLOYMENT_TARGET}-{v.host_cpu}-iphone{host_device}"
134134
elif pyconf.fnmatch(v.host, "*-*-darwin*"):
135135
host_ident = "arm" if v.host_cpu.startswith("arm") else v.host_cpu
136+
elif pyconf.fnmatch(v.host, "*-gnu"):
137+
host_ident = v.host_cpu
136138
elif pyconf.fnmatch(v.host, "*-*-vxworks*"):
137139
host_ident = v.host_cpu
138140
elif pyconf.fnmatch(v.host, "*-*-emscripten"):

configure-new

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5926,6 +5926,8 @@ function u_setup_machdep( SUNOS_VERSION, ac_md_release, ac_md_system, _split_
59265926
V["ac_sys_system"] = "iOS"
59275927
} else if (pyconf_fnmatch(V["host"], "*-*-darwin*")) {
59285928
V["ac_sys_system"] = "Darwin"
5929+
} else if (pyconf_fnmatch(V["host"], "*-gnu")) {
5930+
V["ac_sys_system"] = "GNU"
59295931
} else if (pyconf_fnmatch(V["host"], "*-*-vxworks*")) {
59305932
V["ac_sys_system"] = "VxWorks"
59315933
} else if (pyconf_fnmatch(V["host"], "*-*-emscripten")) {
@@ -6021,6 +6023,8 @@ function u_setup_host_platform( _tmp_split, emcc_ver, host_device, host_ident
60216023
}
60226024
} else if (pyconf_fnmatch(V["host"], "*-*-darwin*")) {
60236025
host_ident = (_str_startswith(V["host_cpu"], "arm") ? "arm" : V["host_cpu"])
6026+
} else if (pyconf_fnmatch(V["host"], "*-gnu")) {
6027+
host_ident = V["host_cpu"]
60246028
} else if (pyconf_fnmatch(V["host"], "*-*-vxworks*")) {
60256029
host_ident = V["host_cpu"]
60266030
} else if (pyconf_fnmatch(V["host"], "*-*-emscripten")) {

0 commit comments

Comments
 (0)