From 3474e16ad4ea8cf4e0e330568e3bc9039e723dce Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 5 Jul 2015 20:25:18 -0700 Subject: [PATCH] libcc1: fix libcc1's install path and rpath * Install libcc1.so and libcc1plugin.so into $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we had done to lto-plugin. * Fix bad RPATH iussue: gcc-5.2.0: package gcc-plugins contains bad RPATH /patht/to/tmp/sysroots/qemux86-64/usr/lib64/../lib64 in file /path/to/gcc/5.2.0-r0/packages-split/gcc-plugins/usr/lib64/gcc/x86_64-poky-linux/5.2.0/plugin/libcc1plugin.so.0.0.0 [rpaths] Upstream-Status: Inappropriate [OE configuration] Signed-off-by: Robert Yang --- libcc1/Makefile.am | 4 ++-- libcc1/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am index c005b0dad4a..ec31d35b7b9 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am @@ -37,8 +37,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ $(Wc)$(libiberty_normal))) libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin -cc1libdir = $(libdir)/$(libsuffix) +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) +plugindir = $(cc1libdir) if ENABLE_PLUGIN plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in index 7104b649026..2103c477468 100644 --- a/libcc1/Makefile.in +++ b/libcc1/Makefile.in @@ -393,8 +393,8 @@ libiberty = $(if $(wildcard $(libiberty_noasan)),$(Wc)$(libiberty_noasan), \ $(Wc)$(libiberty_normal))) libiberty_dep = $(patsubst $(Wc)%,%,$(libiberty)) -plugindir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/plugin -cc1libdir = $(libdir)/$(libsuffix) +cc1libdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version) +plugindir = $(cc1libdir) @ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la libcp1plugin.la @ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la shared_source = callbacks.cc callbacks.hh connection.cc connection.hh \