Skip to content

Commit c585811

Browse files
authored
Rollup merge of rust-lang#109526 - bzEq:aix-libpath, r=Mark-Simulacrum
LIBPATH is used as dylib's path environment variable on AIX See https://4js.com/online_documentation/fjs-fgl-3.00.05-manual-html/c_fgl_installation_017.html.
2 parents a10cd6d + d3cc2f7 commit c585811

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

src/bootstrap/bootstrap.py

+3
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,9 @@ def build_bootstrap(self, color, verbose_count):
741741
env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \
742742
(os.pathsep + env["LIBRARY_PATH"]) \
743743
if "LIBRARY_PATH" in env else ""
744+
env["LIBPATH"] = os.path.join(self.bin_root(), "lib") + \
745+
(os.pathsep + env["LIBPATH"]) \
746+
if "LIBPATH" in env else ""
744747

745748
# Export Stage0 snapshot compiler related env variables
746749
build_section = "target.{}".format(self.build)

src/bootstrap/dylib_util.rs

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ pub fn dylib_path_var() -> &'static str {
1212
"DYLD_LIBRARY_PATH"
1313
} else if cfg!(target_os = "haiku") {
1414
"LIBRARY_PATH"
15+
} else if cfg!(target_os = "aix") {
16+
"LIBPATH"
1517
} else {
1618
"LD_LIBRARY_PATH"
1719
}

src/tools/compiletest/src/util.rs

+2
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ pub fn dylib_env_var() -> &'static str {
156156
"DYLD_LIBRARY_PATH"
157157
} else if cfg!(target_os = "haiku") {
158158
"LIBRARY_PATH"
159+
} else if cfg!(target_os = "aix") {
160+
"LIBPATH"
159161
} else {
160162
"LD_LIBRARY_PATH"
161163
}

0 commit comments

Comments
 (0)