Merge pull request #428 from tonsky/patch-1

Avoid calls to cljs.build.api/src-file->target_file on deps.cljs
emezeske · Dec 18, 2015 · 05d3a19 · 05d3a19
2 parents 55cef95 + b5d1c7d
commit 05d3a19
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/support/src/cljsbuild/compiler.clj b/support/src/cljsbuild/compiler.clj
@@ -133,7 +133,9 @@
           (into {}
             (for [cljs-path (concat cljs-paths checkout-paths)]
               [cljs-path (util/find-files cljs-path (conj additional-file-extensions "clj"))]))
-        cljs-files (mapcat #(util/find-files % (conj additional-file-extensions "cljs")) (concat cljs-paths checkout-paths [crossover-path]))
+        cljs-files (->> (concat cljs-paths checkout-paths [crossover-path])
+                     (mapcat #(util/find-files % (conj additional-file-extensions "cljs")))
+                     (remove #(contains? cljs.compiler/cljs-reserved-file-names (.getName (io/file %)))))
         js-files (let [output-dir-str
                        (.getAbsolutePath (io/file (:output-dir compiler-options)))]
                    (->> lib-paths