|
@@ -43,7 +43,7 @@ diff --git a/config/config.mk b/config/config.mk
|
|
|
diff --git a/config/rules.mk b/config/rules.mk
|
|
|
--- a/config/rules.mk
|
|
|
+++ b/config/rules.mk
|
|
|
-@@ -545,17 +545,17 @@ endif
|
|
|
+@@ -545,18 +545,17 @@ endif
|
|
|
#
|
|
|
# PROGRAM = Foo
|
|
|
# creates OBJS, links with LIBS to create Foo
|
|
@@ -53,6 +53,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
@$(RM) $@.manifest
|
|
|
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
|
|
- $(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
|
|
|
+-
|
|
|
+ $(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
|
|
|
ifdef MSMANIFEST_TOOL
|
|
|
@if test -f $@.manifest; then \
|
|
@@ -62,7 +63,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
else \
|
|
|
echo 'Embedding manifest from $@.manifest'; \
|
|
|
$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
|
|
|
-@@ -566,17 +566,17 @@ ifdef MSMANIFEST_TOOL
|
|
|
+@@ -567,17 +566,17 @@ ifdef MSMANIFEST_TOOL
|
|
|
fi
|
|
|
endif # MSVC with manifest tool
|
|
|
ifdef MOZ_PROFILE_GENERATE
|
|
@@ -71,7 +72,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
touch -t `date +%Y%m%d%H%M.%S -d 'now+5seconds'` pgo.relink
|
|
|
endif
|
|
|
else # !WINNT || GNU_CC
|
|
|
-- $(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
|
|
|
+- $(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
|
|
|
+ $(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
|
|
|
$(call py_action,check_binary,--target $@)
|
|
|
endif # WINNT && !GNU_CC
|
|
@@ -81,7 +82,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
endif
|
|
|
ifdef MOZ_POST_PROGRAM_COMMAND
|
|
|
$(MOZ_POST_PROGRAM_COMMAND) $@
|
|
|
-@@ -617,25 +617,25 @@ endif
|
|
|
+@@ -618,25 +617,25 @@ endif
|
|
|
# Foo.o (from either Foo.c or Foo.cpp).
|
|
|
#
|
|
|
# SIMPLE_PROGRAMS = Foo Bar
|
|
@@ -109,7 +110,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
endif
|
|
|
ifdef MOZ_POST_PROGRAM_COMMAND
|
|
|
$(MOZ_POST_PROGRAM_COMMAND) $@
|
|
|
-@@ -654,17 +654,17 @@ endif
|
|
|
+@@ -655,17 +654,17 @@ endif
|
|
|
endif
|
|
|
ifndef CROSS_COMPILE
|
|
|
$(call py_action,check_binary,--host $@)
|
|
@@ -128,7 +129,7 @@ diff --git a/config/rules.mk b/config/rules.mk
|
|
|
# when rebuilding the corresponding shared library. Defining an empty recipe
|
|
|
# for import libraries forces make to wait for the shared library recipe to
|
|
|
# have run before considering other targets that depend on the import library.
|
|
|
-@@ -682,17 +682,17 @@ endif
|
|
|
+@@ -683,17 +682,17 @@ endif
|
|
|
# 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.
|
|
|
|