FIX: wrong macro argument -load-plugin-executable (#146)

trinhngocthuyen · Dec 30, 2024 · 5678688 · 5678688
1 parent 433c8e4
commit 5678688
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/cocoapods-spm/def/podfile.rb b/lib/cocoapods-spm/def/podfile.rb
@@ -18,7 +18,8 @@ def macro_pods
       macro = requirements[0].delete(:macro) if requirements.first.is_a?(Hash)
       macro ||= {}
       unless macro.empty?
-        requirements[0][:path] = prepare_macro_pod_dir(name, macro).to_s
+        macro_dir = prepare_macro_pod_dir(name, macro)
+        requirements[0][:path] = macro_dir.relative_path_from(Pod::Config.instance.installation_root).to_s
         macro_pods[name] = macro
       end
       origin_pod(name, *requirements)

diff --git a/lib/cocoapods-spm/hooks/post_integrate/05.update_settings.rb b/lib/cocoapods-spm/hooks/post_integrate/05.update_settings.rb
@@ -13,7 +13,8 @@ def run
         private
 
         def macro_plugin_flag_by_config
-          path_prefix = "${PODS_ROOT}/../#{spm_config.macro_prebuilt_root_dir}"
+          prebuild_root_dir = spm_config.macro_prebuilt_root_dir.relative_path_from(pod_config.installation_root)
+          path_prefix = "${PODS_ROOT}/../#{prebuild_root_dir}"
           @macro_plugin_flag_by_config ||= begin
             hash = user_build_configurations.keys.to_h do |config|
               flags = macro_pods.keys.map do |name|