jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: swap setup_toolchain parameter

Browse Source
This commit is contained in:
Sascha Kuehndel (InuSasha) 2019-08-25 17:49:30 +02:00
parent 73eef7432f
commit 266f0932c8
No known key found for this signature in database
GPG Key ID: 109697069529A6DC
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/functions
View File

@ -269,7 +269,7 @@ setup_toolchain() {
fi fi
case "$1:$2" in case "$1:$2" in
meson:target) target:meson)
export DESTIMAGE="target" export DESTIMAGE="target"
export AWK="gawk" export AWK="gawk"
export CC="$TOOLCHAIN/bin/host-gcc" export CC="$TOOLCHAIN/bin/host-gcc"
@ -308,7 +308,7 @@ setup_toolchain() {
export _python_exec_prefix=/usr export _python_exec_prefix=/usr
;; ;;
*:target|*:init) target:*|init:*)
export DESTIMAGE="target" export DESTIMAGE="target"
export CC="${TARGET_PREFIX}gcc" export CC="${TARGET_PREFIX}gcc"
export CXX="${TARGET_PREFIX}g++" export CXX="${TARGET_PREFIX}g++"
@ -354,7 +354,7 @@ setup_toolchain() {
export _python_prefix=/usr export _python_prefix=/usr
export _python_exec_prefix=/usr export _python_exec_prefix=/usr
;; ;;
*:host|*:bootstrap) host:*|bootstrap:*)
export DESTIMAGE="host" export DESTIMAGE="host"
export AWK="gawk" export AWK="gawk"
export CC="$TOOLCHAIN/bin/host-gcc" export CC="$TOOLCHAIN/bin/host-gcc"

2
scripts/build
View File

@ -112,7 +112,7 @@ fi
build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}" build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
# setup toolchain # setup toolchain
setup_toolchain ${PKG_TOOLCHAIN} ${TARGET} setup_toolchain ${TARGET} ${PKG_TOOLCHAIN}
# configure install directory # configure install directory
if [ "${TARGET}" = "target" ]; then if [ "${TARGET}" = "target" ]; then

4
scripts/build_mt
View File

@ -10,7 +10,7 @@ ${SCRIPTS}/checkdeps
# Setup both toolchain cmake configs to avoid potentially racy behaviour later. # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
# Use a fork for host to isolate any variable modifications. # Use a fork for host to isolate any variable modifications.
( setup_toolchain generic host ) ( setup_toolchain host )
setup_toolchain generic target setup_toolchain target
MTADDONBUILD=no start_multithread_build ${@} MTADDONBUILD=no start_multithread_build ${@}

4
scripts/create_addon
View File

@ -132,8 +132,8 @@ fi
# check environment and configure toolchains # check environment and configure toolchains
${SCRIPTS}/checkdeps ${SCRIPTS}/checkdeps
( setup_toolchain generic host ) ( setup_toolchain host )
setup_toolchain generic target setup_toolchain target
# collect list of addons for building # collect list of addons for building
addons= addons=

4
scripts/image
View File

@ -25,8 +25,8 @@ ${SCRIPTS}/checkdeps
# Setup both toolchain cmake configs to avoid potentially racy behaviour later. # Setup both toolchain cmake configs to avoid potentially racy behaviour later.
# Use a fork for host to isolate any variable modifications. # Use a fork for host to isolate any variable modifications.
( setup_toolchain generic host ) ( setup_toolchain host )
setup_toolchain generic target setup_toolchain target
function do_mkimage() { function do_mkimage() {
# Variables used in mkimage script must be passed # Variables used in mkimage script must be passed

2
scripts/install_addon
View File

@ -6,7 +6,7 @@
. config/options "${1}" . config/options "${1}"
# Make sure we have a value for STRIP # Make sure we have a value for STRIP
setup_toolchain generic target setup_toolchain target
[ -n "${2}" ] && PKG_ADDON_ID=${2} [ -n "${2}" ] && PKG_ADDON_ID=${2}