diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-12-05 00:27:18 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-12-05 00:27:18 +0100 |
commit | ff7eac56742bb39b32fcd2ed76c78d718c63eb2a (patch) | |
tree | e22773bbb8eee15679bd92da05277f6de13cf006 | |
parent | 7dcab780e480d89b590cc06eb08350b205cbb5a0 (diff) | |
parent | 8d9336d8bc6b5f90872d8b57b46d25cca87088d8 (diff) |
gnumake2: merging minibranches
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ee816d5692af..7cf58c92d9de 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -86,12 +86,14 @@ else gb_CxxObject__command_dep = endif -# CXXFLAGS and DEFS we want to use for this object. This should usually be the case. -# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget) are the same as the -# PCH_CXXFLAGS/PCH_DEFS should never be overridden on an object -- they should be the same as for the whole -# The DEFS/CXXFLAGS would have too be manually overridden for one object file for them to differ. -# linktarget. In general it should be cleaner to use a static library compiled with different flags and link -# that in rather than mixing different flags in one linktarget. +# Only enable PCH if the PCH_CXXFLAGS and the PCH_DEFS (from the linktarget) +# are the same as the CXXFLAGS and DEFS we want to use for this object. This +# should usually be the case. The DEFS/CXXFLAGS would have too be manually +# overridden for one object file for them to differ. PCH_CXXFLAGS/PCH_DEFS +# should never be overridden on an object -- they should be the same as for the +# whole linktarget. In general it should be cleaner to use a static library +# compiled with different flags and link that in rather than mixing different +# flags in one linktarget. define gb_CxxObject__set_pchflags ifeq ($(gb_ENABLE_PCH),$(true)) ifneq ($(strip $$(PCH_NAME)),) |