From 2fa738f7c3ea91734752bc47b14d8a461e4fd5c2 Mon Sep 17 00:00:00 2001
From: Bernhard Schommer <bernhardschommer@gmail.com>
Date: Mon, 15 Dec 2014 16:18:05 +0100
Subject: Stdlib path is ignored when the configuration has_runtime_lib is set
 to false.

---
 driver/Configuration.ml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'driver/Configuration.ml')

diff --git a/driver/Configuration.ml b/driver/Configuration.ml
index aff638e7..e73125f7 100644
--- a/driver/Configuration.ml
+++ b/driver/Configuration.ml
@@ -58,8 +58,6 @@ let get_config key =
 let bad_config key v =
   Printf.eprintf "Invalid value `%s' for configuation option `%s'\n" v key; exit 2
 
-let stdlib_path = get_config "stdlib_path"
-
 let prepro = get_config "prepro"
 let asm = get_config "asm"
 let linker = get_config "linker"
@@ -81,6 +79,13 @@ let has_runtime_lib =
   | "false" -> false
   | v -> bad_config "has_runtime_lib" v
 
+
+let stdlib_path =
+  if has_runtime_lib then
+    get_config "stdlib_path"
+  else
+    ""
+
 let asm_supports_cfi = 
   match get_config "asm_supports_cfi" with
   | "true" -> true
-- 
cgit