Merge pull request #22994 from stanley-cheung/php-fix-windows-upmerge

PHP: Fix include path for boringssl in windows build
5 years ago · fffea57b54
parent cf0727665d c3f64376b3
commit fffea57b54
2 changed files with 2 additions and 2 deletions
--- a/config.w32
+++ b/config.w32
@ -819,7 +819,7 @@ if (PHP_GRPC != "no") {
    "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
    "/I"+configure_module_dirname+"\\third_party\\abseil-cpp "+
    "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include "+
-    "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
+    "/I"+configure_module_dirname+"\\third_party\\boringssl-with-bazel\\src\\include "+
    "/I"+configure_module_dirname+"\\third_party\\upb "+
    "/I"+configure_module_dirname+"\\third_party\\zlib ");

--- a/templates/config.w32.template
+++ b/templates/config.w32.template
@ -33,7 +33,7 @@
      "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
      "/I"+configure_module_dirname+"\\third_party\\abseil-cpp "+
      "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include "+
-      "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
+      "/I"+configure_module_dirname+"\\third_party\\boringssl-with-bazel\\src\\include "+
      "/I"+configure_module_dirname+"\\third_party\\upb "+
      "/I"+configure_module_dirname+"\\third_party\\zlib ");
  <%