tools/setup: avoid running gn gen twice in the same output directory

cb-fred · Aug 2, 2018 · e5b7d31 · e5b7d31
1 parent 446081b
commit e5b7d31
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/tools/setup.py b/tools/setup.py
@@ -33,7 +33,7 @@ def get_gn_args():
 
 
 # gn gen.
-for mode in ["release", "debug"]:
+def gn_gen(mode):
     os.environ["DENO_BUILD_MODE"] = mode
 
     gn_args = get_gn_args()
@@ -52,3 +52,11 @@ def get_gn_args():
 
     run([third_party.gn_path, "gen", build_path()],
         env=third_party.google_env())
+
+
+mode = build_mode(default=None)
+if mode is not None:
+    gn_gen(mode)
+else:
+    gn_gen("release")
+    gn_gen("debug")
diff --git a/tools/util.py b/tools/util.py
@@ -103,11 +103,11 @@ def rm_readonly(func, path, _):
     shutil.rmtree(directory, onerror=rm_readonly)
 
 
-def build_mode():
+def build_mode(default="debug"):
     if "DENO_BUILD_MODE" in os.environ:
         return os.environ["DENO_BUILD_MODE"]
     else:
-        return "debug"
+        return default
 
 
 # E.G. "out/debug"