summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Library_merged.mk11
1 files changed, 1 insertions, 10 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index d3c5e75c840e..90f30a108da9 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,19 +30,10 @@ $(eval $(call gb_Library_use_libraries,merged,\
$(gb_UWINAPI) \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_static_libraries,gengal,\
- glxtest \
- $(if $(filter unx,$(GUIBASE)),headless) \
-))
-endif
-
-ifneq ($(OS),LINUX)
$(eval $(call gb_Library_use_static_libraries,merged,\
+ $(if $(filter LINUX,$(OS)),glxtest) \
$(if $(filter unx,$(GUIBASE)),headless) \
))
-endif
-
$(eval $(call gb_Library_use_externals,merged,\
icu_headers \