From 353440ef31b07849fa805f316f2d01a26c2087f9 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <gerwitzm@lovullo.com>
Date: Mon, 8 May 2017 16:35:34 -0400
Subject: [PATCH] Reorder static linked output

`set_defaults' wasn't in scope of maps.

* src/current/compiler/js.xsl (compiler:exit-rater lv:package):
  Remove static output.
* src/current/compiler/linker.xsl (l:link-deps lv:package):
  Link static after all other blocks, at highest scope within the
  compiled module.
---
 src/current/compiler/js.xsl     | 3 ---
 src/current/compiler/linker.xsl | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/current/compiler/js.xsl b/src/current/compiler/js.xsl
index cefdf42d..273b6a3e 100644
--- a/src/current/compiler/js.xsl
+++ b/src/current/compiler/js.xsl
@@ -217,9 +217,6 @@
       </for-each>
     <text>}; </text>
 
-    <!-- common stuff -->
-    <call-template name="compiler:static" />
-
     <!-- the rater has been generated; return it -->
     <text>return rater;</text>
   <text>} )()</text>
diff --git a/src/current/compiler/linker.xsl b/src/current/compiler/linker.xsl
index c6b64d8c..42f9a988 100644
--- a/src/current/compiler/linker.xsl
+++ b/src/current/compiler/linker.xsl
@@ -954,6 +954,7 @@
       <xsl:text>compiling entry point...</xsl:text>
     </xsl:with-param>
   </xsl:call-template>
+
   <xsl:apply-templates select="." mode="compiler:entry" />
 
 
@@ -979,6 +980,8 @@
     <xsl:with-param name="deps" select="$deps" />
   </xsl:apply-templates>
 
+  <!-- common stuff -->
+  <xsl:call-template name="compiler:static" />
 
   <!-- finally, finish up -->
   <xsl:call-template name="log:info">