X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Windows%2Fbuild-dependencies;h=e758f1be7026710aa95232d3adf9ae48d9d67a49;hb=refs%2Fheads%2Fctables10;hp=f2e9692167b3acdf55470bd2ebf0e74804346695;hpb=17e858592008dd0fd3fdbe6d510210b4e9c1d613;p=pspp

diff --git a/Windows/build-dependencies b/Windows/build-dependencies
index f2e9692167..e758f1be70 100755
--- a/Windows/build-dependencies
+++ b/Windows/build-dependencies
@@ -51,7 +51,7 @@ while test $# -gt 0; do
     shift 1;
 done
 
-if test -z "$SANDBOX" || -z "$arch"; then
+if test -z "$SANDBOX" -o -z "$arch"; then
             printf "Usage: $0 --arch=<arch> --sandbox=<dir> [--tarballs=<dir>]\n";
     exit 1;
 fi
@@ -282,6 +282,11 @@ for t in $tarballs ; do
             pre_configure=""
             prefix=$SANDBOX/Install
             case $pkg in
+                cairo-*)
+                    extra_cflags="-fstack-protector";;
+                gsl-*)
+                    extra_config_flags="GSL_LDFLAGS=-XCClinker -fstack-protector";
+                    extra_cflags="-fstack-protector";;
                 librsvg-*)
                     extra_config_flags="--disable-tools --enable-introspection=no --disable-gtk-doc-html"
                     build_procs=1
@@ -330,6 +335,8 @@ for t in $tarballs ; do
                     ;;
                 pango-1.48.*)
                     build_system="meson";
+                    extra_cflags="-fstack-protector";
+                    extra_ldflags="-fstack-protector";
                     ;;
                 spread-sheet-widget-*)
                     ;;
@@ -345,7 +352,7 @@ for t in $tarballs ; do
                                      meson setup --prefix=$prefix \
                                      --libdir=lib \
                                      --cross-file=$SANDBOX/cross-file.txt \
-                                     -Dc_link_args=-L$SANDBOX/Install/lib \
+                                     -Dc_link_args="-L$SANDBOX/Install/lib $extra_ldflags" \
                                      -Dc_args="-I$SANDBOX/Install/include $extra_cflags" \
                                      --wrap-mode=nodownload \
                                      $meson_opts \
@@ -359,9 +366,10 @@ for t in $tarballs ; do
                         $SANDBOX/Source/$pkg/configure \
                             --host="$arch" \
                             --prefix="$prefix" \
-                            $extra_config_flags \
-                            CPPFLAGS="-I $depdir/include" \
-                            LDFLAGS="-L$depdir/lib" \
+                            "$extra_config_flags" \
+                            CFLAGS="$extra_cflags" \
+                            CPPFLAGS="-I $depdir/include $extra_cppflags" \
+                            LDFLAGS="-L$depdir/lib $extra_ldflags" \
                             PKG_CONFIG_LIBDIR="$depdir/lib/pkgconfig" &&
                         make -j $build_procs && make install && $extra_build
                     ;;