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 606145 part 1 - Properly link host programs written in C++. r=khuey,a=bsmedberg

Browse Source
This commit is contained in:
Mike Hommey 2011-01-24 09:56:40 +01:00
parent b88aad3dcd
commit b5c0c29e10
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/rules.mk
View File

@ -556,6 +556,9 @@ TAG_PROGRAM = xargs etags -a
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
@ -1085,11 +1088,11 @@ ifdef MSMANIFEST_TOOL
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

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

@ -556,6 +556,9 @@ TAG_PROGRAM = xargs etags -a
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
@ -1085,11 +1088,11 @@ ifdef MSMANIFEST_TOOL
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