summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild28
1 files changed, 17 insertions, 11 deletions
diff --git a/build b/build
index 5b72a16..983436b 100755
--- a/build
+++ b/build
@@ -35,6 +35,7 @@ elf_interp_soname = $$(readelf -d "/usr/lib/$(target)/ld.so" | \
sed -n 's/^.*(SONAME).*\[\([^]]*\)\].*$$/\1/p')
common_opts = \
+ --libexecdir='$${prefix}/libexec' \
--with-pkgversion='GCC for ProteanOS' \
--program-suffix="-$(base_version)" \
--enable-linker-build-id \
@@ -68,9 +69,10 @@ bootstrap1_opts = \
tm = src/gcc/config
# Defaults:
-libdir = /usr/lib/$(OPK_HOST_ARCH)
-libsubdir = /usr/lib/$(OPK_HOST_ARCH)/gcc/$(target_gnu)/$(version)
-libsuffix = $$(g++ -print-multi-os-directory)
+libdir = /usr/lib/$(OPK_HOST_ARCH)
+libsubdir = /usr/lib/$(OPK_HOST_ARCH)/gcc/$(target_gnu)/$(version)
+libexecsubdir = /usr/lib/$(OPK_HOST_ARCH)/gcc/$(target_gnu)/$(version)
+libsuffix = $$(g++ -print-multi-os-directory)
def_gcc_gcc_include_dir = $(libsubdir)/include
def_gcc_fixed_include_dir = $(libsubdir)/include-fixed
def_gcc_gxx_include_dir = /usr/include/c++/$(version)
@@ -172,9 +174,9 @@ install-native:
# gcc programs:
mkdir -p $(destdir)$(gccexedir)
mv \
- $(destdir)$(libsubdir)/cc1* \
- $(destdir)$(libsubdir)/collect2 \
- $(destdir)$(libsubdir)/lto* \
+ $(destdir)$(libexecsubdir)/cc1* \
+ $(destdir)$(libexecsubdir)/collect2 \
+ $(destdir)$(libexecsubdir)/lto* \
$(destdir)$(gccexedir)
# Start files and gcc libraries:
mkdir -p $(destdir)$(tgtlibdir)
@@ -246,14 +248,16 @@ install-native:
-exec rm -f '{}' ';'
# TODO: Provide these files in a fixincludes package (arch:any,
# target-specific?).
- rm -Rf $(destdir)$(libsubdir)/install-tools/
+ rm -Rf \
+ $(destdir)$(libsubdir)/install-tools/ \
+ $(destdir)$(libexecsubdir)/install-tools/
# TODO: Provide these files in a libstdc++-*-dbg package.
rm -f $(destdir)$(libdir)/libstdc++.so.*-gdb.py
rm -Rf $(destdir)/usr/share/gcc-$(version)/python/libstdcxx/
# TODO: Provide these files in a doc package.
rm -Rf $(destdir)/usr/share/man/ $(destdir)/usr/share/info/
# TODO: Provide these files in a gcc-*-plugin-dev package.
- rm -Rf $(destdir)$(libsubdir)/plugin/
+ rm -Rf $(destdir)$(libsubdir)/plugin/ $(destdir)$(libexecsubdir)/plugin/
oh-fixperms -d "$(destdir)"
oh-strip -d "$(destdir)"
OPK_PACKAGES="\
@@ -281,9 +285,9 @@ install-cross:
# Move files into ProteanOS-style directories.
mkdir -p $(destdir)$(gccexedir)
mv \
- $(destdir)$(libsubdir)/cc1* \
- $(destdir)$(libsubdir)/collect2 \
- $(destdir)$(libsubdir)/lto* \
+ $(destdir)$(libexecsubdir)/cc1* \
+ $(destdir)$(libexecsubdir)/collect2 \
+ $(destdir)$(libexecsubdir)/lto* \
$(destdir)$(gccexedir)
rm -Rf \
$(destdir)$(libsubdir)/*.o \
@@ -292,7 +296,9 @@ install-cross:
$(destdir)$(libsubdir)/*.la \
$(destdir)$(libsubdir)/*.so* \
$(destdir)$(libsubdir)/install-tools \
+ $(destdir)$(libexecsubdir)/install-tools \
$(destdir)$(libsubdir)/plugin \
+ $(destdir)$(libexecsubdir)/plugin \
$(destdir)/usr/share/locale \
$(destdir)/usr/share/man \
$(destdir)/usr/share/info