tdf#100302: gbuild: always use $(LFS_CFLAGS)

Currently LFS_CFLAGS are only used in a handful of libraries but there's
no obvious reason why it can't just be set everywhere.

Also set it in windows.mk, i have no idea if it's needed for MinGW
(certainly not for MSVC).

Change-Id: I5f62e3011c2089abbf5539fc54c7ff10e07b1599

13 files changed, 7 insertions, 19 deletions

diff --git a/desktop/Executable_unopkg_com.mk b/desktop/Executable_unopkg_com.mk
index 2c46d2c109a6..4db7d96c4f94 100644
--- a/desktop/Executable_unopkg_com.mk
+++ b/desktop/Executable_unopkg_com.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
-$(eval $(call gb_Executable_add_defs,unopkg_com,\
-    $(LFS_CFLAGS) \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
     desktop/win32/source/guistdio/unopkgio \
 ))
diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk
index 7ac8a48a19a2..763bcd7d0892 100644
--- a/external/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_defs,clucene,\
     -Dclucene_shared_EXPORTS \
     -Dclucene_core_EXPORTS \
     -Dclucene_contribs_lib_EXPORTS \
-    $(LFS_CFLAGS) \
 ))
 
 # clucene is riddled with warnings... let's spare use
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 7994d0284f17..d765a26e466d 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Library_Library,reg))
 
 $(eval $(call gb_Library_add_defs,reg,\
-	$(LFS_CFLAGS) \
 	-DREG_DLLIMPLEMENTATION \
 ))
 
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 80e81248ef5b..868dea4a0f74 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,sal,\
 	$(if $(filter $(OS),IOS), \
 		-DNO_CHILD_PROCESSES \
 	) \
-	$(LFS_CFLAGS) \
 	-DSAL_DLLIMPLEMENTATION \
 	-DRTL_OS="\"$(RTL_OS)\"" \
 	-DRTL_ARCH="\"$(RTL_ARCH)\"" \
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index e92ddb0a67c7..331b465434fd 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -17,10 +17,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_defs,sal_textenc,\
-	$(LFS_CFLAGS) \
-))
-
 $(eval $(call gb_Library_add_exception_objects,sal_textenc,\
 	sal/textenc/context \
 	sal/textenc/convertbig5hkscs \
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index ed4efde10b6c..e9a00ab47551 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
 $(eval $(call gb_Library_add_defs,uwinapi,\
 	$(if $(filter $(COM),GCC), \
 		-Wno-unused-parameter -Wno-return-type) \
-	$(LFS_CFLAGS) \
 ))
 
 $(eval $(call gb_Library_add_cobjects,uwinapi,\
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index dbcf48470835..9127a8a72e28 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -10,10 +10,6 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
-	$(LFS_CFLAGS) \
-))
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
 	sal/cpprt/operators_new_delete \
 ))
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 388cc5ddc12f..e219246d0524 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -39,7 +39,8 @@ gb_OSDEFS := \
 	-DUNIX \
 	-DUNX \
 	-D_REENTRANT \
-	-DNO_PTHREAD_PRIORITY
+	-DNO_PTHREAD_PRIORITY \
+	$(LFS_CFLAGS) \
 
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 01adafbd9994..9bf18c363978 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -38,7 +38,8 @@ gb_OSDEFS := \
 	-DNO_PTHREAD_PRIORITY \
 	-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
 	-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \
-	-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION)
+	-DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \
+	$(LFS_CFLAGS) \
 
 
 gb_CFLAGS := \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 1e9a1f334b8c..de98363a92ff 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -36,6 +36,7 @@ gb_OSDEFS := \
 	-DUNIX \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
+	$(LFS_CFLAGS) \
 
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d6b9fcfe47a1..a51db16e4226 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -34,6 +34,7 @@ gb_OSDEFS := \
 	-DUNIX \
 	-DUNX \
 	$(PTHREAD_CFLAGS) \
+	$(LFS_CFLAGS) \
 
 gb_CFLAGS := \
 	$(gb_CFLAGS_COMMON) \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index ebd2a3c86a94..9c73a50981e9 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -34,6 +34,7 @@ gb_OSDEFS := \
 	-DWIN32 \
 	-DWNT \
 	-DNOMINMAX \
+	$(LFS_CFLAGS) \
 
 
 gb_UWINAPI :=
diff --git a/store/Library_store.mk b/store/Library_store.mk
index d5b02c0e6b97..ab0d02589608 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,store))
 $(eval $(call gb_Library_use_external,store,boost_headers))
 
 $(eval $(call gb_Library_add_defs,store,\
-	$(LFS_CFLAGS) \
 	-DSTORE_DLLIMPLEMENTATION \
 ))