]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
glibc: Fix build on x86
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:51:14 +0000 (20:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Oct 2014 19:51:14 +0000 (20:51 +0100)
Some files that are patched for ARM are not available
on the x86 source tree. Hence the sed command should not
be executed.

lfs/glibc

index 194f5565ee000d0ab417879a306ef7d7799d6250..df3e39224f749f264de68ed2cdcacc659d2bc840 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -284,8 +284,10 @@ endif
        #   Makefile:235: *** mixed implicit and normal rules.  Stop.
        cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 
+ifeq "$(MACHINE_TYPE)" "arm"
        # http://sourceware.org/ml/libc-ports/2011-09/msg00018.html
        cd $(DIR_APP) && sed -e "s/PIC/SHARED/g" -i ports/sysdeps/arm/{,eabi/}{set,__long}jmp.S
+endif
 
 ifeq "$(ROOT)" ""
 ifeq "$(MACHINE_TYPE)" "arm"