48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
|
diff -up firefox-68.0/config/rules.mk.old firefox-68.0/config/rules.mk
|
||
|
|
--- firefox-68.0/config/rules.mk.old 2019-06-26 09:36:58.537034443 +0200
|
||
|
|
+++ firefox-68.0/config/rules.mk 2019-06-26 09:37:38.004970573 +0200
|
||
|
|
@@ -569,7 +569,6 @@ ifdef MOZ_PROFILE_GENERATE
|
||
|
|
endif
|
||
|
|
else # !WINNT || GNU_CC
|
||
|
|
$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
|
||
|
|
- $(call py_action,check_binary,--target $@)
|
||
|
|
endif # WINNT && !GNU_CC
|
||
|
|
|
||
|
|
ifdef ENABLE_STRIP
|
||
|
|
@@ -604,9 +603,6 @@ else
|
||
|
|
$(HOST_CC) -o $@ $(HOST_C_LDFLAGS) $(HOST_LDFLAGS) $($(notdir $@)_OBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||
|
|
endif # HOST_CPP_PROG_LINK
|
||
|
|
endif
|
||
|
|
-ifndef CROSS_COMPILE
|
||
|
|
- $(call py_action,check_binary,--host $@)
|
||
|
|
-endif
|
||
|
|
|
||
|
|
#
|
||
|
|
# This is an attempt to support generation of multiple binaries
|
||
|
|
@@ -630,7 +626,6 @@ ifdef MSMANIFEST_TOOL
|
||
|
|
endif # MSVC with manifest tool
|
||
|
|
else
|
||
|
|
$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) -o $@ $($@_$(OBJS_VAR_SUFFIX)) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
|
||
|
|
- $(call py_action,check_binary,--target $@)
|
||
|
|
endif # WINNT && !GNU_CC
|
||
|
|
|
||
|
|
ifdef ENABLE_STRIP
|
||
|
|
@@ -651,9 +646,6 @@ else
|
||
|
|
$(HOST_CC) $(HOST_OUTOPTION)$@ $(HOST_C_LDFLAGS) $($(notdir $@)_OBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
-ifndef CROSS_COMPILE
|
||
|
|
- $(call py_action,check_binary,--host $@)
|
||
|
|
-endif
|
||
|
|
|
||
|
|
$(LIBRARY): $(OBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||
|
|
$(REPORT_BUILD)
|
||
|
|
@@ -691,7 +683,6 @@ ifndef INCREMENTAL_LINKER
|
||
|
|
$(RM) $@
|
||
|
|
endif
|
||
|
|
$(MKSHLIB) $($@_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
|
||
|
|
- $(call py_action,check_binary,--target $@)
|
||
|
|
|
||
|
|
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||
|
|
ifdef MSMANIFEST_TOOL
|