diff options
| author |  Adam Chlipala <adamc@csail.mit.edu> | 2018-12-19 10:46:04 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-12-19 10:46:04 -0500 |
| commit | eb1dc1a3b6c6f9127105b96c26ba122d0bb9da7b (patch) | |
| tree | a45d1f1f9ccdbff0b24b0d0083fcb7fe1886a82c /src/compiler.sml | |
| parent | c88aa571002f0dd713158f8b80bfeacbd0a69569 (diff) | |
| parent | 8bb360844cbf9861364fd3f8b39b0f1232711e92 (diff) | |
Merge pull request #146 from fabriceleal/utf-icu
utf-8 aware functions for basis. unit-testing.
Diffstat (limited to 'src/compiler.sml')
| -rw-r--r-- | src/compiler.sml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index e7de4d82..868dd628 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -1593,9 +1593,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.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata" else if Settings.getStaticLinking () then - " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a" + " -static " ^ !Settings.configLib ^ "/" ^ #linkStatic proto ^ " " ^ !Settings.configLib ^ "/liburweb.a " ^ !Settings.configIcuLibs ^ " -licui18n -licuuc -licudata" else "-L" ^ !Settings.configLib ^ " " ^ #linkDynamic proto ^ " -lurweb" @@ -1606,6 +1606,7 @@ fun compileC {cname, oname, ename, libs, profile, debug, linker, link = link'} = val compile = (Settings.getCCompiler ()) ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " -Wimplicit -Werror -Wno-unused-value" ^ opt ^ " -I " ^ !Settings.configInclude + ^ " " ^ !Settings.configIcuIncludes ^ " " ^ #compile proto ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname |