nodejs
diff --git a/‎node.gyp‎
Lines changed: 17 additions & 1 deletion b/‎node.gyp‎
Lines changed: 17 additions & 1 deletion
diff --git a/‎src/node_builtins.cc‎
Lines changed: 2 additions & 1 deletion b/‎src/node_builtins.cc‎
Lines changed: 2 additions & 1 deletion
@@ -948,7 +948,13 @@
           },
         }],
         [ 'node_builtin_modules_path!=""', {
-          'defines': [ 'NODE_BUILTIN_MODULES_PATH="<(node_builtin_modules_path)"' ]
+          'defines': [ 'NODE_BUILTIN_MODULES_PATH="<(node_builtin_modules_path)"' ],
+          # When loading builtins from disk, JS source files do not need to
+          # trigger rebuilds since the binary reads them at runtime.
+          'sources!': [
+            '<@(library_files)',
+            '<@(deps_files)',
+          ],
         }],
         [ 'node_shared=="true"', {
           'sources': [
@@ -1103,6 +1109,16 @@
             '<@(deps_files)',
             'config.gypi'
           ],
+          'conditions': [
+            [ 'node_builtin_modules_path!=""', {
+              # When loading builtins from disk, JS source files do not need
+              # to trigger rebuilds since the binary reads them at runtime.
+              'inputs!': [
+                '<@(library_files)',
+                '<@(deps_files)',
+              ],
+            }],
+          ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/node_javascript.cc',
           ],
 
@@ -74,7 +74,8 @@ const BuiltinSource* BuiltinLoader::AddFromDisk(const char* id,
                                                 const std::string& filename,
                                                 const UnionBytes& source) {
   BuiltinSourceType type = GetBuiltinSourceType(id, filename);
-  auto result = source_.write()->emplace(id, BuiltinSource{id, source, type});
+  auto result =
+      source_.write()->insert_or_assign(id, BuiltinSource{id, source, type});
   return &(result.first->second);
 }
Original file line number	Diff line number	Diff line change
@@ -74,7 +74,8 @@ const BuiltinSource* BuiltinLoader::AddFromDisk(const char* id,
74	74	const std::string& filename,
75	75	const UnionBytes& source) {
76	76	BuiltinSourceType type = GetBuiltinSourceType(id, filename);
77		- auto result = source_.write()->emplace(id, BuiltinSource{id, source, type});
	77	+ auto result =
	78	+ source_.write()->insert_or_assign(id, BuiltinSource{id, source, type});
78	79	return &(result.first->second);
79	80	}
80	81