[glibc/siddhesh/default-pie] disable static pie if pie is disabled

[glibc/siddhesh/default-pie] disable static pie if pie is disabled

[Siddhesh Poyarekar]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fc0425875e698943a02886ee016a0b9845076e9f

commit fc0425875e698943a02886ee016a0b9845076e9f
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date:   Tue Dec 7 10:48:16 2021 +0530

    disable static pie if pie is disabled

Diff:
---
 configure    | 1 +
 configure.ac | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure b/configure
index f489cf0dcb..4dce154938 100755
--- a/configure
+++ b/configure
@@ -7004,6 +7004,7 @@ build-pie-default = $libc_cv_pie_default"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can build static PIE programs" >&5
 $as_echo_n "checking if we can build static PIE programs... " >&6; }
+libc_cv_static_pie=$libc_cv_pie_default
 if test "x$libc_cv_pie_default" != xno \
    -a "$libc_cv_no_dynamic_linker" = yes; then
   # Enable static-pie if available
diff --git a/configure.ac b/configure.ac
index 0498760136..55d3162a4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1865,6 +1865,7 @@ AC_MSG_RESULT($libc_cv_pie_default)
 LIBC_CONFIG_VAR([build-pie-default], [$libc_cv_pie_default])
 
 AC_MSG_CHECKING(if we can build static PIE programs)
+libc_cv_static_pie=$libc_cv_pie_default
 if test "x$libc_cv_pie_default" != xno \
    -a "$libc_cv_no_dynamic_linker" = yes; then
   # Enable static-pie if available