aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-06-05 01:39:27 +0000
committerdos-reis <gdr@axiomatics.org>2011-06-05 01:39:27 +0000
commitb68668ab61ea946e780826d9c4e30d58803984b5 (patch)
tree09712049dbd9c9198e9e0bcff334b11f8e66a3fc /src
parentee0a8b815d21cb3078bcd0c4cc4346d45173f6c5 (diff)
downloadopen-axiom-b68668ab61ea946e780826d9c4e30d58803984b5.tar.gz
* driver/main.cc (upgrade_environment): Augment PATH for Windows
DLL search.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/driver/main.cc4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d67abf2d..7198506f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
2011-06-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * driver/main.cc (upgrade_environment): Augment PATH for Windows
+ DLL search.
+
+2011-06-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* driver/Makefile.in (open-axiom$(EXEEXT)): Link statically.
* boot/ast.boot: Remove debugging statement.
diff --git a/src/driver/main.cc b/src/driver/main.cc
index 96b4a007..e5943aa5 100644
--- a/src/driver/main.cc
+++ b/src/driver/main.cc
@@ -88,7 +88,11 @@ namespace OpenAxiom {
const char* ldd_path = option_value(command, "--syslib");
if (ldd_path == 0)
ldd_path = oa_concatenate_string(sysdir, "/lib");
+#ifdef OPENAXIOM_MS_WINDOWS_HOST
+ augment_variable("PATH", ldd_path);
+#else
augment_variable("LD_LIBRARY_PATH", ldd_path);
+#endif
publish_systemdir(sysdir);
}