aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-06-24 22:25:50 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-07-01 10:02:15 +0200
commitad125248030dcb7b3a8e13c96b727262799c48b9 (patch)
treef5d8107fd0c048cfa0fd2ea96f32de2e2f94d1a8
parentc2e24f106058e63d7cb4404da0e7a6f209c162dc (diff)
downloadbuildroot-ad125248030dcb7b3a8e13c96b727262799c48b9.tar.gz
buildroot-ad125248030dcb7b3a8e13c96b727262799c48b9.tar.bz2
package/libglib2: fix build on ARM in Thumb mode
Commit 4102db0f7 (package/libglib2: bump to version 2.60.3) did convert libglib2 over to meson. In doing so, it left a very corner-case along. When the target is an ARM CPU and the build is in thumb mode, then we want to ensure that libglib2 is still built in arm mode (because of inline asm). But with meson, CFLAGS from the environment are passed to the host compiler, so the build breaks, and the meson log contains: Appending CFLAGS from environment: '-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -marm' No LDFLAGS in the environment, not changing global flags. No CPPFLAGS in the environment, not changing global flags. Sanity testing C compiler: cc Is cross compiler: False. Sanity check compiler command line: cc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -marm [...]/build/libglib2-2.60.4/build/meson-private/sanitycheckc.c -o [...]/build/libglib2-2.60.4/build/meson-private/sanitycheckc.exe Sanity check compile stdout: ----- Sanity check compile stderr: cc: error: unrecognized command line option ‘-marm’; did you mean ‘-mabm’? ----- meson.build:1:0: ERROR: Compiler cc can not compile programs. Fix that by using the new per-package CFLAGS feature of the meson infra. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr> Cc: Adam Duskett <aduskett@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
-rw-r--r--package/libglib2/libglib2.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 28f404b74a..38941ca79d 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -12,11 +12,12 @@ LIBGLIB2_LICENSE = LGPL-2.1+
LIBGLIB2_LICENSE_FILES = COPYING
LIBGLIB2_INSTALL_STAGING = YES
+LIBGLIB2_CFLAGS = $(TARGET_CFLAGS)
LIBGLIB2_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
# glib/valgrind.h contains inline asm not compatible with thumb1
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
-LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm"
+LIBGLIB2_CFLAGS += -marm
endif
HOST_LIBGLIB2_CONF_OPTS = \