From a33774adb3e7e902ca1742227ee070b93d602fc8 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 6 Jan 2020 18:15:55 +0000 Subject: [PATCH] Update libssp paths in various Makefile.depend* files I've been advised that the model that uses these are fairly resilient, but we do know the proper path to use (or remove, in the case of ^/targets/...), so go ahead and update them to reflect that. --- lib/libc/Makefile.depend.options | 2 +- lib/libsysdecode/Makefile.depend | 2 +- targets/pseudo/userland/gnu/Makefile.depend | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libc/Makefile.depend.options b/lib/libc/Makefile.depend.options index 8072e90f499a..ff00fa428df2 100644 --- a/lib/libc/Makefile.depend.options +++ b/lib/libc/Makefile.depend.options @@ -3,6 +3,6 @@ DIRDEPS_OPTIONS= SSP -DIRDEPS.SSP.yes= gnu/lib/libssp/libssp_nonshared +DIRDEPS.SSP.yes= lib/libssp_nonshared .include diff --git a/lib/libsysdecode/Makefile.depend b/lib/libsysdecode/Makefile.depend index 1a7ed0fb630c..e5c1e3fcf5ea 100644 --- a/lib/libsysdecode/Makefile.depend +++ b/lib/libsysdecode/Makefile.depend @@ -7,7 +7,6 @@ DIRDEPS = \ gnu/lib/libdialog \ gnu/lib/libgomp \ gnu/lib/libregex \ - gnu/lib/libssp \ gnu/lib/libstdc++ \ gnu/lib/libsupc++ \ include \ @@ -100,6 +99,7 @@ DIRDEPS = \ lib/libsdp \ lib/libsecureboot \ lib/libsqlite3 \ + lib/libssp \ lib/libstand \ lib/libstdthreads \ lib/libtacplus \ diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index 0a1e34c01fdf..356014a4cdcc 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -12,8 +12,6 @@ DIRDEPS = \ gnu/lib/libgcov \ gnu/lib/libgomp \ gnu/lib/libregex/doc \ - gnu/lib/libssp \ - gnu/lib/libssp/libssp_nonshared \ gnu/lib/libstdc++ \ gnu/lib/libsupc++ \ gnu/usr.bin/binutils/ar \