2 files changed, 16 insertions, 1 deletions
diff --git a/TARGETS b/TARGETS
index 43ac0d29..0943d44e 100644
--- a/TARGETS
+++ b/TARGETS
@@ -3,7 +3,16 @@
   { "type": "export"
   , "target": ["src/buildtool/main", "just"]
   , "flexible_config":
-    ["OS", "ARCH", "HOST_ARCH", "TARGET_ARCH", "CC", "CXX", "AR", "ENV"]
+    [ "OS"
+    , "ARCH"
+    , "HOST_ARCH"
+    , "TARGET_ARCH"
+    , "CC"
+    , "CXX"
+    , "AR"
+    , "ENV"
+    , "BUILD_STATIC_BINARY"
+    ]
   }
 , "just":
   { "type": ["@", "rules", "CC", "configure"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index 6582137a..3151d9ae 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -1,5 +1,6 @@
 { "just":
   { "type": ["@", "rules", "CC", "binary"]
+  , "arguments_config": ["BUILD_STATIC_BINARY"]
   , "name": ["just"]
   , "srcs": ["main.cpp"]
   , "private-hdrs": ["main.hpp"]
@@ -18,5 +19,10 @@
     , ["src/utils/cpp", "json"]
     ]
   , "stage": ["src", "buildtool", "main"]
+  , "link external":
+    { "type": "if"
+    , "cond": {"type": "var", "name": "BUILD_STATIC_BINARY"}
+    , "then": ["-static"]
+    }
   }
 }