diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-22 13:54:09 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-04-23 12:35:25 +0200 |
| commit | 26ae620b036432ac3b3eb1322331d2e70b4e9e0e (patch) | |
| tree | c5c413a8d3863c63c0d3716f563f914cee19940a | |
| parent | e8520cb0509c3939d48ee2114c96fef4dc15362b (diff) | |
urelibs: do not merge purpenvhelper (unless mergelibs=all)
Change-Id: I147d05b91d46f05461f0548000c891f89486bcc7
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index ebcb199aa2eb..c106f1f90e49 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -187,7 +187,6 @@ gb_URELIBS := \ introspection \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ - purpenvhelper \ reflection \ reg \ sal \ @@ -195,7 +194,10 @@ gb_URELIBS := \ stocservices \ store \ unoidl \ - xmlreader + xmlreader \ + $(if $(filter ALL,$(MERGELIBS)), \ + purpenvhelper \ + ) endif |