45d545890
Bernhard Reutner-Fischer
2006-05-08
Subject
- fix build
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Rules.mak+9 -2
| @@ -74,7 +74,8 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) | |
| #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") | |
| # This must bind late because srcdir is reset for every source subdirectory. | |
| - | CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) |
| + | INCS:=-I$(top_builddir)/include -I$(top_srcdir)/include |
| + | CFLAGS=$(INCS) -I$(srcdir) |
| CFLAGS+=$(CHECKED_CFLAGS) | |
| ARFLAGS=cru | |
| @@ -300,38 +301,44 @@ pur_disp_compile.c = echo " "CC $(show_objs) | |
| pur_disp_compile.h = echo " "HOSTCC $(show_objs) | |
| pur_disp_strip = echo " "STRIP $(show_objs) | |
| pur_disp_link = echo " "LINK $(show_objs) | |
| + | pur_disp_link.h = echo " "HOSTLINK $(show_objs) |
| pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) | |
| pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs) | |
| sil_disp_compile.c = true | |
| sil_disp_compile.h = true | |
| sil_disp_strip = true | |
| sil_disp_link = true | |
| + | sil_disp_link.h = true |
| sil_disp_ar = true | |
| sil_disp_elf2flt = true | |
| ver_disp_compile.c = echo $(cmd_compile.c) | |
| ver_disp_compile.h = echo $(cmd_compile.h) | |
| ver_disp_strip = echo $(cmd_strip) | |
| ver_disp_link = echo $(cmd_link) | |
| + | ver_disp_link.h = echo $(cmd_link.h) |
| ver_disp_ar = echo $(cmd_ar) | |
| ver_disp_elf2flt = echo $(cmd_elf2flt) | |
| disp_compile.c = $($(DISP)_disp_compile.c) | |
| disp_compile.h = $($(DISP)_disp_compile.h) | |
| disp_strip = $($(DISP)_disp_strip) | |
| disp_link = $($(DISP)_disp_link) | |
| + | disp_link.h = $($(DISP)_disp_link.h) |
| disp_ar = $($(DISP)_disp_ar) | |
| disp_gen = $(SECHO) " "GEN $@ ; true | |
| disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true | |
| disp_elf2flt = $($(DISP)_disp_elf2flt) | |
| cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | |
| - | cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< |
| + | cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) -c -o $@ $< |
| cmd_strip = $(STRIPCMD) $@ | |
| cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) | |
| + | cmd_link.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) $< -o $@ |
| cmd_ar = $(AR) $(ARFLAGS) $@ $^ | |
| cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@ | |
| compile.c = @$(disp_compile.c) ; $(cmd_compile.c) | |
| compile.h = @$(disp_compile.h) ; $(cmd_compile.h) | |
| do_strip = @$(disp_strip) ; $(cmd_strip) | |
| do_link = @$(disp_link) ; $(cmd_link) | |
| + | do_link.h = @$(disp_link.h) ; $(cmd_link.h) |
| do_ar = @$(disp_ar) ; $(cmd_ar) | |
| do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt) | |