Merge pull request #2685 from InuSasha/fixes/nolto

buildsystem: use no-lto, when lto is disabled
This commit is contained in:
MilhouseVH 2018-05-18 20:29:12 +01:00 committed by GitHub
commit df34f3964e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 5 deletions

View File

@ -4,6 +4,10 @@ setup_toolchain() {
TARGET_CFLAGS+=" $CFLAGS_OPTIM_LTO"
TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_LTO"
TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_LTO"
else
TARGET_CFLAGS+=" $CFLAGS_OPTIM_NOLTO"
TARGET_CXXFLAGS+=" $CXXFLAGS_OPTIM_NOLTO"
TARGET_LDFLAGS+=" $LDFLAGS_OPTIM_NOLTO"
fi
# gold flag

View File

@ -35,6 +35,9 @@ HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security"
CFLAGS_OPTIM_LTO="-flto -ffat-lto-objects"
CXXFLAGS_OPTIM_LTO="-flto -ffat-lto-objects"
LDFLAGS_OPTIM_LTO="-fuse-linker-plugin -flto"
CFLAGS_OPTIM_NOLTO="-fno-lto"
CXXFLAGS_OPTIM_NOLTO="-fno-lto"
LDFLAGS_OPTIM_NOLTO="-fno-lto"
# gold flags
LDFLAGS_OPTIM_GOLD="-fuse-ld=gold"

View File

@ -28,8 +28,13 @@ PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python2
PKG_SECTION="mediacenter"
PKG_SHORTDESC="kodi: Kodi Mediacenter"
PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
# Single threaded LTO is very slow so rely on Kodi for LTO support
# Single threaded LTO is very slow so rely on Kodi for parallel LTO support
if [ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug; then
PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL"
else
PKG_BUILD_FLAGS="-lto"
fi
get_graphicdrivers
@ -204,9 +209,6 @@ KODI_LIBDVD="$KODI_DVDCSS \
-DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
-DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
# Build Kodi using parallel LTO
[ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug && PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL"
PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
-DDEPENDS_PATH=$PKG_BUILD/depends \