Browse Source
Merge pull request #55 from WXbet/topush
Add use of EXTRA_LDFLAGS functionality via toolchain.cfg
pull/57/head
Gorgone
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
1 deletions
-
support/functions/_cmd_build
-
support/functions/_gui_build
|
|
|
@ -191,6 +191,7 @@ fi |
|
|
|
"OSCAM_BIN=$bdir/$oscam_name" \ |
|
|
|
"CC_OPTS=$co $cc_opts $extra_cc" \ |
|
|
|
"CC_WARN=$cc_warn" \ |
|
|
|
"EXTRA_LDFLAGS=$extra_ld" \ |
|
|
|
$EXTRA_USE \ |
|
|
|
"CROSS=$CROSS" $STAPI_LIB $USESTRING 2>&1 \ |
|
|
|
|tee -a "$ldir/$log_name" \ |
|
|
|
|
|
|
|
@ -89,7 +89,7 @@ _gui_build(){ |
|
|
|
(ologo; _nl |
|
|
|
timer_start |
|
|
|
make -j"$cpus" \ |
|
|
|
"CONF_DIR=$_oscamconfdir_default" "OSCAM_BIN=$bdir/$oscam_name" "CC_OPTS=$co $cc_opts $extra_cc" "CC_WARN=$cc_warn" $EXTRA_USE "CROSS=$CROSS" $stapivar $USESTRING_ 2>&1 \ |
|
|
|
"CONF_DIR=$_oscamconfdir_default" "OSCAM_BIN=$bdir/$oscam_name" "CC_OPTS=$co $cc_opts $extra_cc" "CC_WARN=$cc_warn" "EXTRA_LDFLAGS=$extra_ld" $EXTRA_USE "CROSS=$CROSS" $stapivar $USESTRING_ 2>&1 \ |
|
|
|
|tee "$ldir/$log_name" \ |
|
|
|
|grep --line-buffered -v 'BFD\|^/' \ |
|
|
|
|grep --line-buffered '^CC\|^GEN\|UseFlags\| CONF_DIR =\|Binary\|LINK\|STRIP\|BUILD\|Addons\|Protocols\|Readers\|CardRdrs\|^/' \ |
|
|
|
|
