summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2001-12-03 10:13:49 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2001-12-03 10:13:49 +0000
commit4f30e429fdea456207a6d096be9cc352daae50fe (patch)
treefa6fa7d955a2a5eec18b7613abfb5c3a555a888f
parent22dd458673a5538de80005777f3b6f93b52bd2d0 (diff)
OCAMLLIB a precedence sur CAMLLIB
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4070 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--byterun/dynlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/byterun/dynlink.c b/byterun/dynlink.c
index ff1c7482b..4caba225e 100644
--- a/byterun/dynlink.c
+++ b/byterun/dynlink.c
@@ -72,7 +72,8 @@ static char * parse_ld_conf(void)
struct stat st;
int ldconf, nread;
- stdlib = getenv("CAMLLIB");
+ stdlib = getenv("OCAMLLIB");
+ if (stdlib == NULL) stdlib = getenv("CAMLLIB");
if (stdlib == NULL) stdlib = OCAML_STDLIB_DIR;
ldconfname = stat_alloc(strlen(stdlib) + 2 + sizeof(LD_CONF_NAME));
strcpy(ldconfname, stdlib);