From da81679c73d79a64519b50fb40764b8d41fd6fd0 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <tgingold@free.fr>
Date: Sat, 27 Apr 2019 18:39:15 +0200
Subject: configure: use default_pic instead of default_pie.

Adjust Makefile.in so that libgrt.a is built with pic only when default_pic is
set.
---
 configure | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 23c63b6a6..a8484acec 100755
--- a/configure
+++ b/configure
@@ -53,7 +53,7 @@ PIC_FLAGS=-fPIC
 show_help=no
 progname=$0
 
-subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version"
+subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pic enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version"
 
 # Find srcdir
 srcdir=`dirname $progname`
@@ -281,11 +281,7 @@ libghdl_version=`echo $ghdl_version | sed -e 's/[-.]/_/g'`
 # Check if gcc was configured with --enable-default-pie.  In that case -fPIC
 # should be added.
 if gcc -v 2>&1 | grep -q enable-default-pie; then
-	default_pie="true"
-fi
-
-if [ "x$default_pic" = "xtrue" ]; then
-	default_pie="true"
+	default_pic="true"
 fi
 
 # Create subdirectories
@@ -377,7 +373,7 @@ sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \
 		-e "s%@INSTALL_PREFIX@%$prefix%" \
 		-e "s%@LIB_PREFIX@%$libdirsuffix%" \
 		-e "s%@SOEXT@%$SOEXT%" \
-		-e "s%@default_pie@%$default_pie%" \
+		-e "s%@default_pic@%$default_pic%" \
 		< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads
 
 exit 0
-- 
cgit v1.2.3