summaryrefslogtreecommitdiff
path: root/src/cjr_print.sml
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2017-07-23 08:45:59 -0400
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2017-07-23 08:45:59 -0400
commit8c58ba2e1db6e97ca1f18fd9ca52ffead53e4a4f (patch)
tree491d3b13813610943c60460d3e178d3a73916346 /src/cjr_print.sml
parent6145d9df05f442e29dfa96a0b8e15ffcc2d683dd (diff)
parentf814fd699dc707e810c996062370ee787863d926 (diff)
Merge branch 'upstream' into dfsg_clean
Diffstat (limited to 'src/cjr_print.sml')
-rw-r--r--src/cjr_print.sml6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 688b3e4d..53587ff7 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -2513,8 +2513,12 @@ fun p_decl env (dAll as (d, loc) : decl) =
| DJavaScript s =>
let
+ val name =
+ (case Settings.getOutputJsFile () of
+ NONE => "app." ^ SHA1.bintohex (SHA1.hash s) ^ ".js"
+ | SOME s => s)
val () = app_js := OS.Path.joinDirFile {dir = Settings.getUrlPrefix (),
- file = "app." ^ SHA1.bintohex (SHA1.hash s) ^ ".js"}
+ file = name}
in
box [string "static char jslib[] = \"",
string (Prim.toCString s),