diff --git a/src/main/clojure/cljs/analyzer.cljc b/src/main/clojure/cljs/analyzer.cljc index 04b93ff078..c15513f30e 100644 --- a/src/main/clojure/cljs/analyzer.cljc +++ b/src/main/clojure/cljs/analyzer.cljc @@ -3523,11 +3523,12 @@ (defn- do-macroexpand-check [form mac-var] - (let [mchk #?(:clj (some-> (find-ns 'clojure.spec.alpha) + (when (not (-> @env/*compiler* :options :spec-skip-macros)) + (let [mchk #?(:clj (some-> (find-ns 'clojure.spec.alpha) (ns-resolve 'macroexpand-check)) :cljs (get-macroexpand-check-var))] (when (some? mchk) - (mchk mac-var (next form))))) + (mchk mac-var (next form)))))) (defn macroexpand-1* [env form] diff --git a/src/main/clojure/cljs/closure.clj b/src/main/clojure/cljs/closure.clj index 0c541c4c37..1f5f49f5db 100644 --- a/src/main/clojure/cljs/closure.clj +++ b/src/main/clojure/cljs/closure.clj @@ -202,7 +202,7 @@ :fn-invoke-direct :checked-arrays :closure-module-roots :rewrite-polyfills :use-only-custom-externs :watch :watch-error-fn :watch-fn :install-deps :process-shim :rename-prefix :rename-prefix-namespace :closure-variable-map-in :closure-property-map-in :closure-variable-map-out :closure-property-map-out - :stable-names :ignore-js-module-exts :opts-cache :aot-cache :elide-strict :fingerprint}) + :stable-names :ignore-js-module-exts :opts-cache :aot-cache :elide-strict :fingerprint :spec-skip-macros}) (def string->charset {"iso-8859-1" StandardCharsets/ISO_8859_1