| author | Mike Hommey <mh+mozilla@glandium.org> |
| Mon, 24 Jan 2011 09:56:40 +0100 | |
| changeset 61169 | 0d947763fe67c2a728141f97f328ce3b8055e270 |
| parent 61168 | 80266029824bf03159356f29ab04d0fc54a664b0 |
| child 61170 | a1ccb1c489baeeb2e738ce9173b5ee079b0243f9 |
| push id | 18255 |
| push user | mh@glandium.org |
| push date | Mon, 24 Jan 2011 08:57:53 +0000 |
| treeherder | mozilla-central@9a6de1e28d4b [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | khuey, bsmedberg |
| bugs | 606145 |
| milestone | 2.0b10pre |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| config/rules.mk | file | annotate | diff | comparison | revisions | |
| js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/config/rules.mk +++ b/config/rules.mk @@ -551,16 +551,19 @@ TAG_PROGRAM = xargs etags -a # # Turn on C++ linking if we have any .cpp or .mm files # (moved this from config.mk so that config.mk can be included # before the CPPSRCS are defined) # ifneq ($(CPPSRCS)$(CMMSRCS),) CPP_PROG_LINK = 1 endif +ifneq ($(HOST_CPPSRCS)$(HOST_CMMSRCS),) +HOST_CPP_PROG_LINK = 1 +endif # # Make sure to wrap static libs inside linker specific flags to turn on & off # inclusion of all symbols inside the static libs # ifndef NO_LD_ARCHIVE_FLAGS ifdef SHARED_LIBRARY_LIBS EXTRA_DSO_LDOPTS := $(MKSHLIB_FORCE_ALL) $(call EXPAND_FAKELIBS,$(SHARED_LIBRARY_LIBS)) $(MKSHLIB_UNFORCE_ALL) $(EXTRA_DSO_LDOPTS) @@ -1080,21 +1083,21 @@ ifdef MSMANIFEST_TOOL mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ fi; \ elif test -f "$(srcdir)/$@.manifest"; then \ echo "Embedding manifest from $(srcdir)/$@.manifest"; \ mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" -OUTPUTRESOURCE:$@\;1; \ fi endif # MSVC with manifest tool else -ifeq ($(CPP_PROG_LINK),1) +ifeq ($(HOST_CPP_PROG_LINK),1) $(HOST_CXX) -o $@ $(HOST_CXXFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) else $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) -endif # CPP_PROG_LINK +endif # HOST_CPP_PROG_LINK endif endif # # This is an attempt to support generation of multiple binaries # in one directory, it assumes everything to compile Foo is in # Foo.o (from either Foo.c or Foo.cpp). #
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -551,16 +551,19 @@ TAG_PROGRAM = xargs etags -a # # Turn on C++ linking if we have any .cpp or .mm files # (moved this from config.mk so that config.mk can be included # before the CPPSRCS are defined) # ifneq ($(CPPSRCS)$(CMMSRCS),) CPP_PROG_LINK = 1 endif +ifneq ($(HOST_CPPSRCS)$(HOST_CMMSRCS),) +HOST_CPP_PROG_LINK = 1 +endif # # Make sure to wrap static libs inside linker specific flags to turn on & off # inclusion of all symbols inside the static libs # ifndef NO_LD_ARCHIVE_FLAGS ifdef SHARED_LIBRARY_LIBS EXTRA_DSO_LDOPTS := $(MKSHLIB_FORCE_ALL) $(call EXPAND_FAKELIBS,$(SHARED_LIBRARY_LIBS)) $(MKSHLIB_UNFORCE_ALL) $(EXTRA_DSO_LDOPTS) @@ -1080,21 +1083,21 @@ ifdef MSMANIFEST_TOOL mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ fi; \ elif test -f "$(srcdir)/$@.manifest"; then \ echo "Embedding manifest from $(srcdir)/$@.manifest"; \ mt.exe -NOLOGO -MANIFEST "$(win_srcdir)/$@.manifest" -OUTPUTRESOURCE:$@\;1; \ fi endif # MSVC with manifest tool else -ifeq ($(CPP_PROG_LINK),1) +ifeq ($(HOST_CPP_PROG_LINK),1) $(HOST_CXX) -o $@ $(HOST_CXXFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) else $(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) -endif # CPP_PROG_LINK +endif # HOST_CPP_PROG_LINK endif endif # # This is an attempt to support generation of multiple binaries # in one directory, it assumes everything to compile Foo is in # Foo.o (from either Foo.c or Foo.cpp). #