Date: Thu, 17 Mar 2011 04:40:38 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r219710 - head/lib/libc/sys Message-ID: <201103170440.p2H4ecQF014425@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Thu Mar 17 04:40:37 2011 New Revision: 219710 URL: http://svn.freebsd.org/changeset/base/219710 Log: When building libc with the syscall compatibility, don't also generate the syscall assembly files. This results in conflicting dependencies and can cause unexpected results for parallel builds. This is because the .c file and the .S file both generate the same .o file. Submitted by: Simon Gerraty <sjg@juniper.net> Sponsored by: Juniper Networks Modified: head/lib/libc/sys/Makefile.inc Modified: head/lib/libc/sys/Makefile.inc ============================================================================== --- head/lib/libc/sys/Makefile.inc Thu Mar 17 04:30:43 2011 (r219709) +++ head/lib/libc/sys/Makefile.inc Thu Mar 17 04:40:37 2011 (r219710) @@ -18,7 +18,10 @@ # Sources common to both syscall interfaces: SRCS+= stack_protector.c stack_protector_compat.c __error.c .if !defined(WITHOUT_SYSCALL_COMPAT) -SRCS+= fcntl.c ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c +SYSCALL_COMPAT_SRCS= fcntl.c ftruncate.c lseek.c mmap.c pread.c \ + pwrite.c truncate.c +SRCS+= ${SYSCALL_COMPAT_SRCS} +NOASM+= ${SYSCALL_COMPAT_SRCS:S/.c/.o/} PSEUDO+= _fcntl.o .endif SRCS+= sigwait.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103170440.p2H4ecQF014425>