diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 20:48:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-03-10 20:48:21 -0400 |
commit | ffd602eb4693bbb49b301fa059b109bbdebf9524 (patch) | |
tree | a7be15ffb7fe1a23dde4dc2831670f3abed6ce95 /scripts/kconfig/conf.c | |
parent | 5af7f115886f7ec193171e2e49b8000ddd1e7147 (diff) | |
parent | 9250d20e9ecedab6aa331a127fbfc1272383ed72 (diff) |
Merge tag 'kbuild-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild updates from Masahiro Yamada:
- do not generate unneeded top-level built-in.a
- let git ignore O= directory entirely
- optimize scripts/kallsyms slightly
- exclude DWARF info from *.s regardless of config options
- fix GCC toolchain search path for Clang to prepare ld.lld support
- do not generate modules.order when CONFIG_MODULES is disabled
- simplify single target rules and remove VPATH for external module
build
- allow to add optional flags to dpkg-buildpackage when building
deb-pkg
- move some compiler option tests from Makefile to Kconfig
- various Makefile cleanups
* tag 'kbuild-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (40 commits)
kbuild: remove scripts/basic/% build target
kbuild: use -Werror=implicit-... instead of -Werror-implicit-...
kbuild: clean up scripts/gcc-version.sh
kbuild: remove cc-version macro
kbuild: update comment block of scripts/clang-version.sh
kbuild: remove commented-out INITRD_COMPRESS
kbuild: move -gsplit-dwarf, -gdwarf-4 option tests to Kconfig
kbuild: [bin]deb-pkg: add DPKG_FLAGS variable
kbuild: move ".config not found!" message from Kconfig to Makefile
kbuild: invoke syncconfig if include/config/auto.conf.cmd is missing
kbuild: simplify single target rules
kbuild: remove empty rules for makefiles
kbuild: make -r/-R effective in top Makefile for old Make versions
kbuild: move tools_silent to a more relevant place
kbuild: compute false-positive -Wmaybe-uninitialized cases in Kconfig
kbuild: refactor cc-cross-prefix implementation
kbuild: hardcode genksyms path and remove GENKSYMS variable
scripts/gdb: refactor rules for symlink creation
kbuild: create symlink to vmlinux-gdb.py in scripts_gdb target
scripts/gdb: do not descend into scripts/gdb from scripts
...
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index da89ef788a8d..ef3678c24bab 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -488,7 +488,6 @@ int main(int ac, char **av) | |||
488 | const char *progname = av[0]; | 488 | const char *progname = av[0]; |
489 | int opt; | 489 | int opt; |
490 | const char *name, *defconfig_file = NULL /* gcc uninit */; | 490 | const char *name, *defconfig_file = NULL /* gcc uninit */; |
491 | struct stat tmpstat; | ||
492 | int no_conf_write = 0; | 491 | int no_conf_write = 0; |
493 | 492 | ||
494 | tty_stdio = isatty(0) && isatty(1); | 493 | tty_stdio = isatty(0) && isatty(1); |
@@ -560,18 +559,6 @@ int main(int ac, char **av) | |||
560 | name = av[optind]; | 559 | name = av[optind]; |
561 | conf_parse(name); | 560 | conf_parse(name); |
562 | //zconfdump(stdout); | 561 | //zconfdump(stdout); |
563 | if (sync_kconfig) { | ||
564 | name = conf_get_configname(); | ||
565 | if (stat(name, &tmpstat)) { | ||
566 | fprintf(stderr, "***\n" | ||
567 | "*** Configuration file \"%s\" not found!\n" | ||
568 | "***\n" | ||
569 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" | ||
570 | "*** \"make menuconfig\" or \"make xconfig\").\n" | ||
571 | "***\n", name); | ||
572 | exit(1); | ||
573 | } | ||
574 | } | ||
575 | 562 | ||
576 | switch (input_mode) { | 563 | switch (input_mode) { |
577 | case defconfig: | 564 | case defconfig: |