Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/llvm/include Use head to remove final #endif, n...



details:   https://anonhg.NetBSD.org/src/rev/66b3de34720d
branches:  trunk
changeset: 325753:66b3de34720d
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Jan 05 15:15:34 2014 +0000

description:
Use head to remove final #endif, newer versions will contain multiple
conditional blocks for dealing with Apple universal binaries.

diffstat:

 external/bsd/llvm/include/Makefile |  12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r cf812994b3dc -r 66b3de34720d external/bsd/llvm/include/Makefile
--- a/external/bsd/llvm/include/Makefile        Sun Jan 05 15:13:36 2014 +0000
+++ b/external/bsd/llvm/include/Makefile        Sun Jan 05 15:15:34 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2013/11/11 23:51:36 joerg Exp $
+#      $NetBSD: Makefile,v 1.26 2014/01/05 15:15:34 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -150,9 +150,8 @@
        mkdir -p ${.TARGET:H}
        ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
            -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \
-           -e /^\#endif/d \
-           < ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in \
-           > ${.TARGET}.tmp
+           < ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in | \
+       head -n -1 > ${.TARGET}.tmp
        printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
        printf '#define PACKAGE_VERSION "${LLVM_VERSION} (trunk ${LLVM_REVISION})"\n' >> ${.TARGET}.tmp
        printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
@@ -164,9 +163,8 @@
        mkdir -p ${.TARGET:H}
        ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
            -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \
-           -e /\#endif/d \
-           < ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in \
-           > ${.TARGET}.tmp
+           < ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in | \
+       head -n -1 > ${.TARGET}.tmp
        printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
        printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
        printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp



Home | Main Index | Thread Index | Old Index