From 1997fb4a75aba11be2c806222a355e418dad28b3 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 25 May 2019 20:01:58 -0400
Subject: cpp-*-*-*-*, gcc-*-*-*-*, g++-*-*-*-*: Use /usr/libexec

First ProteanOS source package to do this!
---
diff --git a/build b/build
index 983436b..f4895d8 100755
--- a/build
+++ b/build
@@ -79,7 +79,7 @@ def_gcc_gxx_include_dir          = /usr/include/c++/$(version)
 def_gcc_gxx_tool_include_dir     = $(def_gcc_gxx_include_dir)/$(target_gnu)
 def_gcc_gxx_backward_include_dir = $(def_gcc_gxx_include_dir)/backward
 # Customs:
-gccexedir = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc/$(base_version)
+gccexedir = /usr/libexec/gcc/$(target)/$(base_version)
 tgtlibdir = /usr/lib/$(target)/gcc/$(base_version)
 gcc_gcc_include_dir          = /usr/include/$(target)/gcc/$(base_version)
 gcc_fixed_include_dir        = /usr/include/$(target)/gcc/$(base_version)/fixed
diff --git a/cpp.pkg.in/files b/cpp.pkg.in/files
index 3403d11..924670e 100644
--- a/cpp.pkg.in/files
+++ b/cpp.pkg.in/files
@@ -1,2 +1,2 @@
 /usr/bin/*cpp-*
-/usr/lib/*/*/gcc/*/cc1
+/usr/libexec/gcc/*/*/cc1
diff --git a/g++.pkg.in/files b/g++.pkg.in/files
index eaffbc9..cd2267a 100644
--- a/g++.pkg.in/files
+++ b/g++.pkg.in/files
@@ -1,3 +1,3 @@
 /usr/bin/*c++-*
 /usr/bin/*g++-*
-/usr/lib/*/*/gcc/*/cc1plus
+/usr/libexec/gcc/*/*/cc1plus
diff --git a/gcc.pkg.in/files b/gcc.pkg.in/files
index 5baef9b..48132bd 100644
--- a/gcc.pkg.in/files
+++ b/gcc.pkg.in/files
@@ -1,8 +1,8 @@
 /usr/bin/*gcc-*
 /usr/bin/*gcov-*
-/usr/lib/*/*/gcc/*/collect2
-/usr/lib/*/*/gcc/*/lto-wrapper
-/usr/lib/*/*/gcc/*/lto1
+/usr/libexec/gcc/*/*/collect2
+/usr/libexec/gcc/*/*/lto-wrapper
+/usr/libexec/gcc/*/*/lto1
 /usr/lib/*/gcc/*/*.o
 /usr/lib/*/gcc/*/include-fixed/
 /usr/lib/*/gcc/*/include/
--
cgit v0.9.1