summaryrefslogtreecommitdiff
path: root/solenv
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 /solenv
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 'solenv')
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk3
-rw-r--r--solenv/gbuild/platform/macosx.mk3
-rw-r--r--solenv/gbuild/platform/solaris.mk1
-rw-r--r--solenv/gbuild/platform/unxgcc.mk1
-rw-r--r--solenv/gbuild/platform/windows.mk1
5 files changed, 7 insertions, 2 deletions
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 :=