Better GRPC_LIBDIR config

10 years ago · bc29d80159
parent c80530920b
commit bc29d80159
2 changed files with 2 additions and 5 deletions
--- a/src/php/ext/grpc/config.m4
+++ b/src/php/ext/grpc/config.m4
@ -38,11 +38,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_LIBRARY(rt,,GRPC_SHARED_LIBADD)
  PHP_ADD_LIBRARY(rt)

-  if test -e $GRPC_DIR/libs/opt; then
-    GRPC_LIBDIR=$GRPC_DIR/libs/opt
-  else
-    GRPC_LIBDIR=$GRPC_DIR/lib
-  fi
+  GRPC_LIBDIR=$GRPC_DIR/${GRPC_LIB_SUBDIR-lib}

  PHP_ADD_LIBPATH($GRPC_LIBDIR)

--- a/tools/run_tests/build_php.sh
+++ b/tools/run_tests/build_php.sh
@ -6,6 +6,7 @@ set -ex
 cd $(dirname $0)/../..

 root=`pwd`
+export GRPC_LIB_SUBDIR=libs/opt

 # make the libraries
 make -j static_c