Add proper flags to have gettext use the proper libiconv

Author: ychin

.github/actions/universal-package/action.yml

@@ -35,21 +35,24 @@ runs:
         # version and stomp what we have here.
         brew update
 
-        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
-        # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
-        # compiler flags that will cause universal builds to fail as Clang does not like that.
-        brew cat ${formula} | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' | \
-          sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' >${formula}.rb
+        brew cat ${formula} >${formula}.rb
 
         if [[ "${{ inputs.gnuiconv }}" == "true" ]]; then
           # We also manually depend on GNU libiconv as Apple iconv is broken since macOS 14. This is necessary as MacVim
           # itself it built against it and we need both to match.
           sed -i.bak '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] += " -I'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
+          sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] += " -L'$(brew --prefix)$'/opt/libiconv/lib"\n' ${formula}.rb
         fi
 
+        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
+        # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
+        # compiler flags that will cause universal builds to fail as Clang does not like that.
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+        sed -i.bak '/^[[:blank:]]*def install$/a\'$'\n    ENV["LDFLAGS"] = "-arch x86_64 -arch arm64"\n' ${formula}.rb
+
         # Homebrew requires formula files to be placed in taps and disallows
         # installing from raw paths, so we manually create a taps folder for a
         # 'macvim-dev/deps' tap.