Kaydet (Commit) 62b75cd1 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst cb4bfd0c
...@@ -11,10 +11,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com)) ...@@ -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_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,\ $(eval $(call gb_Executable_add_exception_objects,unopkg_com,\
desktop/win32/source/guistdio/unopkgio \ desktop/win32/source/guistdio/unopkgio \
)) ))
......
...@@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_defs,clucene,\ ...@@ -27,7 +27,6 @@ $(eval $(call gb_Library_add_defs,clucene,\
-Dclucene_shared_EXPORTS \ -Dclucene_shared_EXPORTS \
-Dclucene_core_EXPORTS \ -Dclucene_core_EXPORTS \
-Dclucene_contribs_lib_EXPORTS \ -Dclucene_contribs_lib_EXPORTS \
$(LFS_CFLAGS) \
)) ))
# clucene is riddled with warnings... let's spare use # clucene is riddled with warnings... let's spare use
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
$(eval $(call gb_Library_Library,reg)) $(eval $(call gb_Library_Library,reg))
$(eval $(call gb_Library_add_defs,reg,\ $(eval $(call gb_Library_add_defs,reg,\
$(LFS_CFLAGS) \
-DREG_DLLIMPLEMENTATION \ -DREG_DLLIMPLEMENTATION \
)) ))
......
...@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,sal,\ ...@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,sal,\
$(if $(filter $(OS),IOS), \ $(if $(filter $(OS),IOS), \
-DNO_CHILD_PROCESSES \ -DNO_CHILD_PROCESSES \
) \ ) \
$(LFS_CFLAGS) \
-DSAL_DLLIMPLEMENTATION \ -DSAL_DLLIMPLEMENTATION \
-DRTL_OS="\"$(RTL_OS)\"" \ -DRTL_OS="\"$(RTL_OS)\"" \
-DRTL_ARCH="\"$(RTL_ARCH)\"" \ -DRTL_ARCH="\"$(RTL_ARCH)\"" \
......
...@@ -17,10 +17,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\ ...@@ -17,10 +17,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_Library_add_defs,sal_textenc,\
$(LFS_CFLAGS) \
))
$(eval $(call gb_Library_add_exception_objects,sal_textenc,\ $(eval $(call gb_Library_add_exception_objects,sal_textenc,\
sal/textenc/context \ sal/textenc/context \
sal/textenc/convertbig5hkscs \ sal/textenc/convertbig5hkscs \
......
...@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ ...@@ -23,7 +23,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\
$(eval $(call gb_Library_add_defs,uwinapi,\ $(eval $(call gb_Library_add_defs,uwinapi,\
$(if $(filter $(COM),GCC), \ $(if $(filter $(COM),GCC), \
-Wno-unused-parameter -Wno-return-type) \ -Wno-unused-parameter -Wno-return-type) \
$(LFS_CFLAGS) \
)) ))
$(eval $(call gb_Library_add_cobjects,uwinapi,\ $(eval $(call gb_Library_add_cobjects,uwinapi,\
......
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
$(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
))
$(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \ $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \ sal/cpprt/operators_new_delete \
)) ))
......
...@@ -39,7 +39,8 @@ gb_OSDEFS := \ ...@@ -39,7 +39,8 @@ gb_OSDEFS := \
-DUNIX \ -DUNIX \
-DUNX \ -DUNX \
-D_REENTRANT \ -D_REENTRANT \
-DNO_PTHREAD_PRIORITY -DNO_PTHREAD_PRIORITY \
$(LFS_CFLAGS) \
gb_CFLAGS := \ gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \ $(gb_CFLAGS_COMMON) \
......
...@@ -38,7 +38,8 @@ gb_OSDEFS := \ ...@@ -38,7 +38,8 @@ gb_OSDEFS := \
-DNO_PTHREAD_PRIORITY \ -DNO_PTHREAD_PRIORITY \
-DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \ -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \ -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 := \ gb_CFLAGS := \
......
...@@ -36,6 +36,7 @@ gb_OSDEFS := \ ...@@ -36,6 +36,7 @@ gb_OSDEFS := \
-DUNIX \ -DUNIX \
-DUNX \ -DUNX \
$(PTHREAD_CFLAGS) \ $(PTHREAD_CFLAGS) \
$(LFS_CFLAGS) \
gb_CFLAGS := \ gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \ $(gb_CFLAGS_COMMON) \
......
...@@ -34,6 +34,7 @@ gb_OSDEFS := \ ...@@ -34,6 +34,7 @@ gb_OSDEFS := \
-DUNIX \ -DUNIX \
-DUNX \ -DUNX \
$(PTHREAD_CFLAGS) \ $(PTHREAD_CFLAGS) \
$(LFS_CFLAGS) \
gb_CFLAGS := \ gb_CFLAGS := \
$(gb_CFLAGS_COMMON) \ $(gb_CFLAGS_COMMON) \
......
...@@ -34,6 +34,7 @@ gb_OSDEFS := \ ...@@ -34,6 +34,7 @@ gb_OSDEFS := \
-DWIN32 \ -DWIN32 \
-DWNT \ -DWNT \
-DNOMINMAX \ -DNOMINMAX \
$(LFS_CFLAGS) \
gb_UWINAPI := gb_UWINAPI :=
......
...@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,store)) ...@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,store))
$(eval $(call gb_Library_use_external,store,boost_headers)) $(eval $(call gb_Library_use_external,store,boost_headers))
$(eval $(call gb_Library_add_defs,store,\ $(eval $(call gb_Library_add_defs,store,\
$(LFS_CFLAGS) \
-DSTORE_DLLIMPLEMENTATION \ -DSTORE_DLLIMPLEMENTATION \
)) ))
......
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