Merge pull request #530 from plexinc/pr-lto-flags

functions : Make sure sure we also remove lto flags from TARGET_FLAGS.
This commit is contained in:
Lukas Rusak 2016-07-23 01:04:31 -07:00 committed by GitHub
commit a3564931ad

View File

@ -211,15 +211,19 @@ strip_lto() {
if [ -n "$GCC_OPTIM_LTO" ] ; then if [ -n "$GCC_OPTIM_LTO" ] ; then
CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"` CFLAGS=`echo $CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"` CXXFLAGS=`echo $CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
TARGET_CFLAGS=`echo $TARGET_CFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
TARGET_CXXFLAGS=`echo $TARGET_CXXFLAGS | sed -e "s|$GCC_OPTIM_LTO||g"`
fi fi
if [ -n "$LD_OPTIM_LTO" ] ; then if [ -n "$LD_OPTIM_LTO" ] ; then
LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"` LDFLAGS=`echo $LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
TARGET_LDFLAGS=`echo $TARGET_LDFLAGS | sed -e "s|$LD_OPTIM_LTO||g"`
fi fi
} }
strip_gold() { strip_gold() {
# strip out usage from GOLD linker # strip out usage from GOLD linker
LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"` LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
TARGET_LDFLAGS=echo $TARGET_LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
} }
fix_module_depends() { fix_module_depends() {