Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / lfs / glibc

diff --git a/lfs/glibc b/lfs/glibc
index 7c8ed5e9a1e37589d67b21396919024691002f64..c0af6fc06cfd7c5b09121208ec21a4dbc7ea1aaf 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -51,7 +51,8 @@ else
        --with-headers=/tools/include \
        libc_cv_forced_unwind=yes \
        libc_cv_ctors_header=yes \
-       libc_cv_c_cleanup=yes
+       libc_cv_c_cleanup=yes \
+       CC=/tools/bin/$(CROSSTARGET)-gcc
   EXTRA_MAKE =
   EXTRA_INSTALL =
 endif
@@ -358,6 +359,7 @@ endif
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.12-accept-make-versions-4.0-and-greater.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-mq_open.patch
 
        # Fixes:
        #   Makefile:235: *** mixed implicit and normal rules.  Stop.