summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ada/gprbuild')
-rw-r--r--dev-ada/gprbuild/files/gprbuild-2017-config.patch4
-rw-r--r--dev-ada/gprbuild/gprbuild-2017-r1.ebuild6
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-config.patch b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
index cb37dd58dd2d..5dcd58ffb21d 100644
--- a/dev-ada/gprbuild/files/gprbuild-2017-config.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-config.patch
@@ -107,7 +107,7 @@
null;
when others =>
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
end case;
</config>
</configuration>
@@ -116,7 +116,7 @@
</targets>
<config>
- for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc", "-nostdlib", "-Wl,-r", "-o");
-+ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-o");
++ for Library_Partial_Linker use ("${PATH(ada)}${PREFIX(c)}gcc-@VER@", "-nostdlib", "-Wl,-r", "-no-pie", "-o");
</config>
</configuration>
diff --git a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
index df5101ac4bfc..d279f478a5e8 100644
--- a/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2017-r1.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
-e "s:@GNATBIND@:gnatbind-${GCC_PV}:g" \
src/gprlib.adb \
|| die
+ if use gnat_2016; then
+ sed -i \
+ -e 's:"-no-pie", ::g' \
+ share/gprconfig/linker.xml \
+ || die
+ fi
}
src_configure() {