diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-08 20:20:32 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-05-08 20:20:32 +0000 |
| commit | 45d545890faa025491716035426ceb2af9c1906f (patch) | |
| tree | 5a13ff058f8515025d5d43daf9fcc7becdf9bfd1 | |
| parent | a6b5b60942b4e28965f10cb107d4f94aaf756bc1 (diff) | |
| download | busybox-w32-45d545890faa025491716035426ceb2af9c1906f.tar.gz busybox-w32-45d545890faa025491716035426ceb2af9c1906f.tar.bz2 busybox-w32-45d545890faa025491716035426ceb2af9c1906f.zip | |
- fix build
| -rw-r--r-- | Rules.mak | 11 |
1 files changed, 9 insertions, 2 deletions
| @@ -74,7 +74,8 @@ CFLAGS_EXTRA=$(subst ",, $(strip $(EXTRA_CFLAGS_OPTIONS))) | |||
| 74 | #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") | 74 | #GCCINCDIR:=$(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") |
| 75 | 75 | ||
| 76 | # This must bind late because srcdir is reset for every source subdirectory. | 76 | # This must bind late because srcdir is reset for every source subdirectory. |
| 77 | CFLAGS=-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) | 77 | INCS:=-I$(top_builddir)/include -I$(top_srcdir)/include |
| 78 | CFLAGS=$(INCS) -I$(srcdir) | ||
| 78 | CFLAGS+=$(CHECKED_CFLAGS) | 79 | CFLAGS+=$(CHECKED_CFLAGS) |
| 79 | ARFLAGS=cru | 80 | ARFLAGS=cru |
| 80 | 81 | ||
| @@ -300,38 +301,44 @@ pur_disp_compile.c = echo " "CC $(show_objs) | |||
| 300 | pur_disp_compile.h = echo " "HOSTCC $(show_objs) | 301 | pur_disp_compile.h = echo " "HOSTCC $(show_objs) |
| 301 | pur_disp_strip = echo " "STRIP $(show_objs) | 302 | pur_disp_strip = echo " "STRIP $(show_objs) |
| 302 | pur_disp_link = echo " "LINK $(show_objs) | 303 | pur_disp_link = echo " "LINK $(show_objs) |
| 304 | pur_disp_link.h = echo " "HOSTLINK $(show_objs) | ||
| 303 | pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) | 305 | pur_disp_ar = echo " "AR $(ARFLAGS) $(show_objs) |
| 304 | pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs) | 306 | pur_disp_elf2flt = echo " "ELF2FLT $(ELF2FLTFLAGS) $(show_objs) |
| 305 | sil_disp_compile.c = true | 307 | sil_disp_compile.c = true |
| 306 | sil_disp_compile.h = true | 308 | sil_disp_compile.h = true |
| 307 | sil_disp_strip = true | 309 | sil_disp_strip = true |
| 308 | sil_disp_link = true | 310 | sil_disp_link = true |
| 311 | sil_disp_link.h = true | ||
| 309 | sil_disp_ar = true | 312 | sil_disp_ar = true |
| 310 | sil_disp_elf2flt = true | 313 | sil_disp_elf2flt = true |
| 311 | ver_disp_compile.c = echo $(cmd_compile.c) | 314 | ver_disp_compile.c = echo $(cmd_compile.c) |
| 312 | ver_disp_compile.h = echo $(cmd_compile.h) | 315 | ver_disp_compile.h = echo $(cmd_compile.h) |
| 313 | ver_disp_strip = echo $(cmd_strip) | 316 | ver_disp_strip = echo $(cmd_strip) |
| 314 | ver_disp_link = echo $(cmd_link) | 317 | ver_disp_link = echo $(cmd_link) |
| 318 | ver_disp_link.h = echo $(cmd_link.h) | ||
| 315 | ver_disp_ar = echo $(cmd_ar) | 319 | ver_disp_ar = echo $(cmd_ar) |
| 316 | ver_disp_elf2flt = echo $(cmd_elf2flt) | 320 | ver_disp_elf2flt = echo $(cmd_elf2flt) |
| 317 | disp_compile.c = $($(DISP)_disp_compile.c) | 321 | disp_compile.c = $($(DISP)_disp_compile.c) |
| 318 | disp_compile.h = $($(DISP)_disp_compile.h) | 322 | disp_compile.h = $($(DISP)_disp_compile.h) |
| 319 | disp_strip = $($(DISP)_disp_strip) | 323 | disp_strip = $($(DISP)_disp_strip) |
| 320 | disp_link = $($(DISP)_disp_link) | 324 | disp_link = $($(DISP)_disp_link) |
| 325 | disp_link.h = $($(DISP)_disp_link.h) | ||
| 321 | disp_ar = $($(DISP)_disp_ar) | 326 | disp_ar = $($(DISP)_disp_ar) |
| 322 | disp_gen = $(SECHO) " "GEN $@ ; true | 327 | disp_gen = $(SECHO) " "GEN $@ ; true |
| 323 | disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true | 328 | disp_doc = $(SECHO) " "DOC $(subst docs/,,$@) ; true |
| 324 | disp_elf2flt = $($(DISP)_disp_elf2flt) | 329 | disp_elf2flt = $($(DISP)_disp_elf2flt) |
| 325 | cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< | 330 | cmd_compile.c = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< |
| 326 | cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< | 331 | cmd_compile.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) -c -o $@ $< |
| 327 | cmd_strip = $(STRIPCMD) $@ | 332 | cmd_strip = $(STRIPCMD) $@ |
| 328 | cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) | 333 | cmd_link = $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LDFLAGS) |
| 334 | cmd_link.h = $(HOSTCC) $(HOSTCFLAGS) $(INCS) $< -o $@ | ||
| 329 | cmd_ar = $(AR) $(ARFLAGS) $@ $^ | 335 | cmd_ar = $(AR) $(ARFLAGS) $@ $^ |
| 330 | cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@ | 336 | cmd_elf2flt = $(ELF2FLT) $(ELF2FLTFLAGS) $< -o $@ |
| 331 | compile.c = @$(disp_compile.c) ; $(cmd_compile.c) | 337 | compile.c = @$(disp_compile.c) ; $(cmd_compile.c) |
| 332 | compile.h = @$(disp_compile.h) ; $(cmd_compile.h) | 338 | compile.h = @$(disp_compile.h) ; $(cmd_compile.h) |
| 333 | do_strip = @$(disp_strip) ; $(cmd_strip) | 339 | do_strip = @$(disp_strip) ; $(cmd_strip) |
| 334 | do_link = @$(disp_link) ; $(cmd_link) | 340 | do_link = @$(disp_link) ; $(cmd_link) |
| 341 | do_link.h = @$(disp_link.h) ; $(cmd_link.h) | ||
| 335 | do_ar = @$(disp_ar) ; $(cmd_ar) | 342 | do_ar = @$(disp_ar) ; $(cmd_ar) |
| 336 | do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt) | 343 | do_elf2flt = @$(disp_elf2flt) ; $(cmd_elf2flt) |
| 337 | 344 | ||