Make deps compilation on x86 possible

third-party/build.py

@@ -6,7 +6,6 @@ from builder import Builder
 from config import Config
 from deps import ag, pcre, xz
 from deps.ag import AgBuilder
-from deps.pcre import PcreBuilder
 
 DEPS_FILE_NAME = ".deps"
 PACKAGE_NAME = "vimr-deps"
@@ -109,7 +108,7 @@ if __name__ == "__main__":
             make_command=xz.make_command,
             build_universal_and_install_command=xz.build_universal_and_install_command,
         ),
-        "pcre": PcreBuilder(
+        "pcre": Builder(
             pcre_config,
             download_command=pcre.download_command,
             make_command=pcre.make_command,

third-party/builder.py

@@ -36,6 +36,7 @@ class Builder:
                 cflags=self.config.target_specific_full_cflags(target),
                 deployment_target=self.config.target_specific_deployment_target(target),
                 install_path=self.config.target_specific_install_path(target),
+                host=self.config.target_specific_host(target),
             )
         )
         print(cmd)

third-party/deps/pcre.py

@@ -52,18 +52,3 @@ lipo -create -output "${install_lib_path}/libpcre.a" "${arm64_lib_path}/libpcre.
 cp -r "${arm64_include_path}"/* "${install_include_path}"
 """
 )
-
-
-class PcreBuilder(Builder):
-    def make(self, target: Target):
-        cmd = self.make_command.substitute(
-            dict(
-                target=target.value,
-                cflags=self.config.target_specific_full_cflags(target),
-                deployment_target=self.config.target_specific_deployment_target(target),
-                install_path=self.config.target_specific_install_path(target),
-                host=self.config.target_specific_host(target),
-            )
-        )
-        print(cmd)
-        shell(cmd, cwd=self.config.working_directory)

third-party/deps/xz.py

@@ -34,6 +34,7 @@ pushd ./xz-${target} >/dev/null
     --disable-lzma-links \
     --disable-scripts \
     --disable-doc \
+    --host="${host}" \
     --prefix="${install_path}"
 make MACOSX_DEPLOYMENT_TARGET="${deployment_target}" install
 popd >/dev/null