diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-20 19:48:38 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2015-04-22 19:00:32 +0200 |
| commit | fa8aaaadc38372185d6d29d8d91391907e95b689 (patch) | |
| tree | 347b6a293d8bd0525b94a22bdac00ab0c0edfb67 /connectivity | |
| parent | 0cf38e7d0c5d2b67dca828aae1797bff58b6c5fe (diff) | |
Bin confusing --enable-mergelibs=all option
It was most probably not working anyway and is something different to
libmerged, which intends to merge only core set of libraries.
To build everything into one library, approach similar to what we do for
Android could be better idea.
Change-Id: Id5b8c2fa2b26e8faaaeb022ea55eb2e39909e875
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/CppunitTest_connectivity_commontools.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 146c6afeeb2b..9c2e6450a2f9 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -32,7 +32,7 @@ endif # In mergedlibs mode we have multiply-defined symbols, which Visual Studio # does not like. There is no good solution, so just force it. ifeq ($(COM),MSC) -ifeq ($(MERGELIBS),CORE) +ifneq (,$(MERGELIBS)) $(eval $(call gb_CppunitTest_add_ldflags,connectivity_commontools,\ /FORCE:MULTIPLE \ )) |