Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

busybox:Added lost part of "fix the problem of repeated compilation" #583

Merged
merged 1 commit into from
Feb 11, 2021
Merged

busybox:Added lost part of "fix the problem of repeated compilation" #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion trunk/user/busybox/busybox-1.24.x/Makefile.flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CPPFLAGS += \
-include include/autoconf.h \
-D_GNU_SOURCE -DNDEBUG \
$(if $(CONFIG_LFS),-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) \
-DBB_VER=$(call name-fix,$(BB_VER)) -DBB_BT=AUTOCONF_TIMESTAMP
-DBB_VER=$(squote)$(quote)$(BB_VER)$(quote)$(squote) -DBB_BT=AUTOCONF_TIMESTAMP

CFLAGS += $(call cc-option,-Wall,)
CFLAGS += $(call cc-option,-Wshadow,)
Expand Down
1 change: 1 addition & 0 deletions trunk/user/busybox/busybox-1.24.x/scripts/Kbuild.include
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# Convinient variables
comma := ,
squote := '
quote := "
empty :=
space := $(empty) $(empty)

Expand Down
2 changes: 1 addition & 1 deletion trunk/user/busybox/busybox-1.24.x/scripts/Makefile.lib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs))
# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
# where foo and bar are the name of the modules.
name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote)
basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget))
basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(*F))
modname_flags = $(if $(filter 1,$(words $(modname))),\
-DKBUILD_MODNAME=$(call name-fix,$(modname)))

Expand Down
3 changes: 0 additions & 3 deletions trunk/user/busybox/busybox-1.24.x/scripts/trylink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ check_cc() {
echo "int main(int argc,char**argv){return argv?argc:0;}" >"$tempname".c
# Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
# Was using "-xc /dev/null", but we need a valid C program.
# "eval" may be needed if CFLAGS can contain
# '... -D"BB_VER=KBUILD_STR(1.N.M)" ...'
# and we need shell to process quotes!
$CC $CFLAGS $1 "$tempname".c -o "$tempname" >/dev/null 2>&1
r=$?
rm -f "$tempname" "$tempname".c "$tempname".o
Expand Down