summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler.sml4
-rw-r--r--src/settings.sig1
-rw-r--r--src/settings.sml1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/compiler.sml b/src/compiler.sml
index 06615bcf..1f77a821 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -1585,9 +1585,9 @@ fun compileC {cname, oname, ename, libs, profile, debug, linker, link = link'} =
val proto = Settings.currentProtocol ()
val lib = if Settings.getBootLinking () then
- !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
+ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuIncludes ^ " " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
else if Settings.getStaticLinking () then
- " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
+ " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuIncludes ^ " " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata"
else
"-L" ^ !Settings.configLib ^ " " ^ #linkDynamic proto ^ " -lurweb"
diff --git a/src/settings.sig b/src/settings.sig
index 22dc80a2..29817467 100644
--- a/src/settings.sig
+++ b/src/settings.sig
@@ -37,6 +37,7 @@ signature SETTINGS = sig
val configSrcLib : string ref
val configInclude : string ref
val configSitelisp : string ref
+ val configIcuIncludes : string ref
val configIcuLibs : string ref
val libUr : unit -> string
diff --git a/src/settings.sml b/src/settings.sml
index 8ae2d377..2e386a4f 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -32,6 +32,7 @@ val configLib = ref Config.lib
val configSrcLib = ref Config.srclib
val configInclude = ref Config.includ
val configSitelisp = ref Config.sitelisp
+val configIcuIncludes = ref Config.icuIncludes
val configIcuLibs = ref Config.icuLibs
val configCCompiler = ref Config.ccompiler