Bug 1082910, race condition copyhing sdk/bootstrap.js, r=mshal a=lmandel
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 21 Oct 2014 14:21:12 +1300
changeset 225760 8c63e1286d75
parent 225755 8cc403ad710b
child 225763 da489398c483
push id4006
push usernthomas@mozilla.com
push date2014-10-21 01:25 +0000
treeherdermozilla-beta@8c63e1286d75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, lmandel
bugs1082910
milestone34.0
Bug 1082910, race condition copyhing sdk/bootstrap.js, r=mshal a=lmandel
addon-sdk/Makefile.in
addon-sdk/copy_source.py
--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -7,17 +7,17 @@ include $(topsrcdir)/config/config.mk
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 MOZ_B2G=1
 else
 MOZ_B2G=0
 endif
 
 libs::
 	$(PYTHON) $(srcdir)/copy_source.py $(topsrcdir) $(srcdir)/source/lib $(FINAL_TARGET)/modules/commonjs $(MOZ_B2G) >copy_source.mk
-	$(MAKE) -f copy_source.mk libs
+	$(MAKE) -f copy_source.mk copy_source
 
 include $(topsrcdir)/config/rules.mk
 
 TEST_FILES = \
   source/app-extension \
   source/bin \
   source/python-lib \
   source/test \
--- a/addon-sdk/copy_source.py
+++ b/addon-sdk/copy_source.py
@@ -53,11 +53,12 @@ for dirpath, dirnames, filenames in os.w
         ]:
         continue
     varname = "COMMONJS%s" % relative.replace('/', '_')
     print "%s_FILES = \\" % varname
     for name in filenames:
         print "  %s/%s \\" % (dirpath, name)
     print "  $(NULL)"
     print "%s_DEST = %s%s" % (varname, target_dir, relative)
+    print "%s_TARGET = copy_source" % varname
     print "INSTALL_TARGETS += %s\n" % varname
 
 print "include $(topsrcdir)/config/rules.mk"