Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 557413 - Fix race condition building static and shared libraries. r=ted

Browse Source
This commit is contained in:
Dan Witte 2010-04-08 16:03:06 -07:00
parent 338fcb61bb
commit 2a07aa0dc1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/rules.mk
View File

@ -1239,7 +1239,7 @@ endif
# symlinks back to the originals. The symlinks are a no-op for stabs debugging, # symlinks back to the originals. The symlinks are a no-op for stabs debugging,
# so no need to conditionalize on OS version or debugging format. # so no need to conditionalize on OS version or debugging format.
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
ifndef INCREMENTAL_LINKER ifndef INCREMENTAL_LINKER
rm -f $@ rm -f $@
endif endif

8
js/src/Makefile.in
View File

@ -295,7 +295,7 @@ ctypes/libffi/.libs/libffi.$(LIB_SUFFIX): ctypes/libffi/.libs/libffi.a
emxomf $< emxomf $<
endif endif
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS += \
ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \ ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
$(NULL) $(NULL)
endif # JS_HAS_CTYPES endif # JS_HAS_CTYPES
@ -371,12 +371,12 @@ include $(topsrcdir)/config/rules.mk
ifdef JS_HAS_CTYPES ifdef JS_HAS_CTYPES
# Build libffi proper as part of the 'exports' target, so things get built # Build libffi proper as part of the 'exports' target, so things get built
# in the right order. Specify -j1 to make sure we don't get a parallel build. # in the right order.
export:: export::
$(MAKE) -j1 -C ctypes/libffi $(call SUBMAKE,,ctypes/libffi)
clean:: clean::
$(MAKE) -j1 -C ctypes/libffi clean $(call SUBMAKE,clean,ctypes/libffi)
endif endif
ifdef MOZ_SYNC_BUILD_FILES ifdef MOZ_SYNC_BUILD_FILES

2
js/src/config/rules.mk
View File

@ -1239,7 +1239,7 @@ endif
# symlinks back to the originals. The symlinks are a no-op for stabs debugging, # symlinks back to the originals. The symlinks are a no-op for stabs debugging,
# so no need to conditionalize on OS version or debugging format. # so no need to conditionalize on OS version or debugging format.
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS) $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
ifndef INCREMENTAL_LINKER ifndef INCREMENTAL_LINKER
rm -f $@ rm -f $@
endif endif