diff options
| author | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2014-07-14 19:09:11 +0000 |
| commit | 3c1d4742e649fe9c8aed8c2817fe3e1f3364f298 (patch) | |
| tree | e0c6e02c89aa9227726c9469da1001b3e29c41df /solenv/gbuild | |
| parent | c5c31e2aeaedbdf76e1f38d3c385e34f5ed875ca (diff) | |
Resync to trunk, windows non-pro build
aoo/aw080
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 3dfd2df82ded..5a3ab0414554 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -494,7 +494,7 @@ define gb_LinkTarget_add_external_libs # Make sure that all libraries are given as base names. ifneq (,$$(filter -l% lib% %.so %.lib, $(2))) -$$(eval $$(call gb_Output_announce,ERROR: Please give only libary basenames to gb_LinkTarget_add_external_libs)) +$$(eval $$(call gb_Output_announce,ERROR: Please give only library basenames to gb_LinkTarget_add_external_libs)) $$(eval $$(call gb_Output_announce,ERROR: (no prefixes -l% or lib%, no suffixes %.so or %.lib))) $$(eval $$(call gb_Output_announce,ERROR: libraries given: $(2))) $$(eval $$(call gb_Output_announce,ERROR: offending: $$(filter -l% lib% %.so %.lib, $(2)))) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 7f1fe75c2f37..2bedf65298db 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -212,7 +212,7 @@ $(eval $(call gb_Deliver_init)) # It is important to include them in the right order as that is # -- at least in part -- defining precedence. This is not an issue in the # WORKDIR as there are no nameing collisions there, but OUTDIR is a mess -# and precedence is important there. This is also platform dependant. +# and precedence is important there. This is also platform dependent. # For example: # $(OUTDIR)/bin/% for executables collides # with $(OUTDIR)/bin/%.res for resources on unix |