[S] Change in osmo-dev[master]: ccache.opts: find wrapper in debian path too

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email ) Change subject: ccache.opts: find wrapper in debian path too ...................................................................... ccache.opts: find wrapper in debian path too With Debian's packaging, the ccache symlinks are created in /usr/lib/ccache/, not in /usr/lib/ccache/bin/. Tweak ccache.opts to find gcc and g++ in both paths. Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 --- M ccache.opts M ttcn3/ttcn3.opts 2 files changed, 18 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved; Verified diff --git a/ccache.opts b/ccache.opts index 13dca45..46c6d87 100644 --- a/ccache.opts +++ b/ccache.opts @@ -1 +1,2 @@ -ALL CC="/usr/lib/ccache/bin/gcc" CXX="/usr/lib/ccache/bin/g++" +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" diff --git a/ttcn3/ttcn3.opts b/ttcn3/ttcn3.opts index bf2f472..7949d16 100644 --- a/ttcn3/ttcn3.opts +++ b/ttcn3/ttcn3.opts @@ -1,2 +1,4 @@ osmo-bts --enable-trx -ALL CC="/usr/lib/ccache/gcc" CXX="/usr/lib/ccache/g++" + +# Find the ccache wrapper in /usr/lib/ccache and /usr/lib/ccache/bin +ALL CC="$(find /usr/lib/ccache -name gcc | head -n1)" CXX="$(find /usr/lib/ccache -name g++ | head -n1)" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/36991?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I3803d453c06c503bc9c0ea1823cb9470e5f157b1 Gerrit-Change-Number: 36991 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged