Skip to content

C
core
Kaydet (Commit) 26ae620b authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

urelibs: do not merge purpenvhelper (unless mergelibs=all) 

Change-Id: I147d05b91d46f05461f0548000c891f89486bcc7
üst e8520cb0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
solenv/gbuild/extensions/pre_MergedLibsList.mk
Dosyayı görüntüle @ 26ae620b
...@@ -187,7 +187,6 @@ gb_URELIBS := \ ...@@ -187,7 +187,6 @@ gb_URELIBS := \
introspection \ introspection \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmaccess) \
$(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \ $(if $(filter TRUE,$(SOLAR_JAVA)),jvmfwk) \
purpenvhelper \
reflection \ reflection \
reg \ reg \
sal \ sal \
...@@ -195,7 +194,10 @@ gb_URELIBS := \ ...@@ -195,7 +194,10 @@ gb_URELIBS := \
stocservices \ stocservices \
store \ store \
unoidl \ unoidl \
xmlreader xmlreader \
$(if $(filter ALL,$(MERGELIBS)), \
purpenvhelper \
)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment