tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1From 3f1f99ef82a65d66e3aaa429bf4fb746b93da0db Mon Sep 17 00:00:00 2001
2From: Kito Cheng <kito.cheng@sifive.com>
3Date: Tue, 27 May 2025 10:10:15 +0800
4Subject: [PATCH] c++tools: Don't check --enable-default-pie.
5
6`--enable-default-pie` is an option to specify whether to enable
7position-independent executables by default for `target`.
8
9However c++tools is build for `host`, so it should just follow
10`--enable-host-pie` option to determine whether to build with
11position-independent executables or not.
12
13NOTE:
14
15I checked PR 98324 and build with same configure option
16(`--enable-default-pie` and lto bootstrap) on x86-64 linux to make sure
17it won't cause same problem.
18
19c++tools/ChangeLog:
20
21 * configure.ac: Don't check `--enable-default-pie`.
22 * configure: Regen.
23---
24 c++tools/configure | 11 -----------
25 c++tools/configure.ac | 6 ------
26 2 files changed, 17 deletions(-)
27
28diff --git a/c++tools/configure b/c++tools/configure
29index 1353479becaf4..6df4a2f0dfaed 100755
30--- a/c++tools/configure
31+++ b/c++tools/configure
32@@ -700,7 +700,6 @@ enable_option_checking
33 enable_c___tools
34 enable_maintainer_mode
35 enable_checking
36-enable_default_pie
37 enable_host_pie
38 enable_host_bind_now
39 with_gcc_major_version_only
40@@ -1335,7 +1334,6 @@ Optional Features:
41 enable expensive run-time checks. With LIST, enable
42 only specific categories of checks. Categories are:
43 yes,no,all,none,release.
44- --enable-default-pie enable Position Independent Executable as default
45 --enable-host-pie build host code as PIE
46 --enable-host-bind-now link host code as BIND_NOW
47
48@@ -2946,15 +2944,6 @@ $as_echo "#define ENABLE_ASSERT_CHECKING 1" >>confdefs.h
49
50 fi
51
52-# Check whether --enable-default-pie was given.
53-# Check whether --enable-default-pie was given.
54-if test "${enable_default_pie+set}" = set; then :
55- enableval=$enable_default_pie; PICFLAG=-fPIE
56-else
57- PICFLAG=
58-fi
59-
60-
61 # Enable --enable-host-pie
62 # Check whether --enable-host-pie was given.
63 if test "${enable_host_pie+set}" = set; then :
64diff --git a/c++tools/configure.ac b/c++tools/configure.ac
65index db34ee678e033..8c4b72a8023a8 100644
66--- a/c++tools/configure.ac
67+++ b/c++tools/configure.ac
68@@ -97,12 +97,6 @@ if test x$ac_assert_checking != x ; then
69 [Define if you want assertions enabled. This is a cheap check.])
70 fi
71
72-# Check whether --enable-default-pie was given.
73-AC_ARG_ENABLE(default-pie,
74-[AS_HELP_STRING([--enable-default-pie],
75- [enable Position Independent Executable as default])],
76-[PICFLAG=-fPIE], [PICFLAG=])
77-
78 # Enable --enable-host-pie
79 AC_ARG_ENABLE(host-pie,
80 [AS_HELP_STRING([--enable-host-pie],