summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-10-07 14:12:01 +0200
committerMichael Stahl <mstahl@redhat.com>2016-10-07 14:58:17 +0200
commit62b75cd1698474b9232b46777e418de4786a3132 (patch)
treefe9b453408d9b9ed78fbf1100db242f7b4affcfb /sal
parentcb4bfd0c82bc31003d4cd949ed540773c83c04e9 (diff)
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
Diffstat (limited to 'sal')
-rw-r--r--sal/Library_sal.mk1
-rw-r--r--sal/Library_sal_textenc.mk4
-rw-r--r--sal/Library_uwinapi.mk1
-rw-r--r--sal/StaticLibrary_salcpprt.mk4
4 files changed, 0 insertions, 10 deletions
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 \
))