ソースを参照

pregen: Fix the parallel build problem in pregen target

* pregen-headers really need the headers to get themselves generated.
  so we create explicit dependency and invoke make as an action on
  pregen. This fixes the parallel build issue for better.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj 16 年 前
コミット
046035ecde
1 ファイル変更3 行追加5 行削除
  1. 3 5
      Makefile.in

+ 3 - 5
Makefile.in

@@ -16,9 +16,6 @@ noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
 
 
 include $(top_srcdir)Rules.mak
 include $(top_srcdir)Rules.mak
 sub_headers := headers
 sub_headers := headers
-
-pregen-headers-y := $(top_builddir)include/bits/sysnum.h
-
 ifndef KCONFIG_CONFIG
 ifndef KCONFIG_CONFIG
 KCONFIG_CONFIG := $(top_builddir).config
 KCONFIG_CONFIG := $(top_builddir).config
 endif
 endif
@@ -160,9 +157,10 @@ headers_clean-y += sysdep_common_headers-clean
 # libc/sysdeps/linux/Makefile.commonarch to headers-y
 # libc/sysdeps/linux/Makefile.commonarch to headers-y
 headers-y += $(target-headers-sysdep)
 headers-y += $(target-headers-sysdep)
 
 
-headers: $(top_builddir)include/bits/uClibc_config.h
+headers: $(top_builddir)include/bits/uClibc_config.h $(top_builddir)include/bits/sysnum.h
 subdirs: $(addprefix $(top_builddir),$(subdirs))
 subdirs: $(addprefix $(top_builddir),$(subdirs))
-pregen: headers $(pregen-headers-y) subdirs
+pregen: headers subdirs
+	$(Q)$(MAKE) $(pregen-headers-y)
 	$(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers)
 	$(Q)$(if $(UCLIBC_HAS_LOCALE),$(MAKE) -C extra/locale locale_headers)
 
 
 $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh
 $(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh