summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2010-02-26 16:30:15 -0800
committerAaron Plattner <aplattner@nvidia.com>2010-02-26 16:30:15 -0800
commite9064b09445c504fb8a559105fce053bd1a45f86 (patch)
treee98d7fa1c8c6228b48415d4a50e644f661b7065f
parente018935284c05841f7a85f9733ccb1b2e461e10b (diff)
195.36.08195.36.08
-rw-r--r--DRIVER_VERSION2
-rw-r--r--misc.c15
2 files changed, 13 insertions, 4 deletions
diff --git a/DRIVER_VERSION b/DRIVER_VERSION
index 43be9b5..5539866 100644
--- a/DRIVER_VERSION
+++ b/DRIVER_VERSION
@@ -1 +1 @@
-195.36.03
+195.36.08
diff --git a/misc.c b/misc.c
index 0e9795f..21c0a19 100644
--- a/misc.c
+++ b/misc.c
@@ -1733,9 +1733,18 @@ static int rtld_test_internal(Options *op, Package *p,
cmd = nvstrcat(op->utils[LDD], " ", tmpfile, " > ", tmpfile1, NULL);
if (run_command(op, cmd, NULL, FALSE, 0, TRUE)) {
- ui_warn(op, "Unable to perform the runtime configuration "
- "check for library '%s' ('%s'); assuming successful "
- "installation.", name, p->entries[i].dst);
+ /* running ldd on a 32-bit SO will fail without a 32-bit loader */
+ if (compat_32_libs) {
+ ui_warn(op, "Unable to perform the runtime configuration "
+ "check for 32-bit library '%s' ('%s'); this is "
+ "typically caused by the lack of a 32-bit "
+ "compatibility environment. Assuming successful "
+ "installation.", name, p->entries[i].dst);
+ } else {
+ ui_warn(op, "Unable to perform the runtime configuration "
+ "check for library '%s' ('%s'); assuming successful "
+ "installation.", name, p->entries[i].dst);
+ }
goto done;
}