Bug 1553905 - Fix samples build for new NSPR layout r=marcusburghardt SAMPLES_BRANCH
authorrks1986 <rks1986@gmail.com>
Thu, 23 May 2019 17:32:00 -0700
branchSAMPLES_BRANCH
changeset 15131 f976ec68d63a835a8817546a557496600bd04baa
parent 12520 eae170937268175a75273704d872ec7d5c6e78d4
push id3370
push userjjones@mozilla.com
push dateTue, 28 May 2019 16:00:24 +0000
reviewersmarcusburghardt
bugs1553905
Bug 1553905 - Fix samples build for new NSPR layout r=marcusburghardt
samples/makesample.sh
--- a/samples/makesample.sh
+++ b/samples/makesample.sh
@@ -12,17 +12,17 @@
 # the second argument is the target, either all or clean, defalt is all
 # the third arguments is the name of the objects directory
 # for example: Linux3.17_x86_64_glibc_PTH_64_DBG.OBJ 
 export SAMPLES="sample1 sample2 sample3 sample4 sample5 sample6"
 export ROOT_DIR=`pwd`/../..
 export DIST_DIR=${ROOT_DIR}/dist
 export BIN_DIR=${DIST_DIR}/$3/bin
 export LIB_DIR=${DIST_DIR}/$3/lib
-export NSPR_INC_DIR=${DIST_DIR}/$3/include
+export NSPR_INC_DIR=${DIST_DIR}/$3/include/nspr
 export NSS_INC_DIR=${DIST_DIR}/public/nss
 export PATH=${PATH}:${BIN_DIR}
 export LD_LIBRARY_PATH=${LIB_DIR}
 export DONT_USE_PKG_CONFIG=1
 #export TARGET=[ "$2" = "clean" ] && "clean" || "all"
 if [ -z "$1" ]; then
   for d in $SAMPLES
     do