patches/duma/2_5_14/110-separate_cpp.patch
author Johannes Stezenbach <js@sig21.net>
Sun Oct 14 23:46:15 2012 +0000 (2012-10-14)
changeset 3082 39ec9e913d79
parent 572 944e145f3890
permissions -rw-r--r--
scripts: move backtrace marker to CT_WORK_DIR

Avoid error when commands in scripts/crosstool-NG.sh fail
before CT_BUILD_DIR is set.

So we need to remove the backtrace marker of a potential previous
build. Previously, it was implicitly removed because we did remove
the directory it was in, which is no longer the case.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
[yann.morin.1998@free.fr: remove backtrace marker on start of build]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20121015094615.GA18673@sig21.net>
Patchwork-Id: 191498
     1 diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
     2 --- duma_2_5_14.orig/Makefile	2008-06-17 10:30:40.000000000 +0200
     3 +++ duma_2_5_14/Makefile	2008-06-17 10:30:17.000000000 +0200
     4 @@ -228,9 +228,13 @@
     5  	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
     6  	createconf.c
     7  
     8 -OBJECTS = dumapp.o duma.o sem_inc.o print.o
     9 +OBJECTS = duma.o sem_inc.o print.o
    10 +SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
    11  
    12 -SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
    13 +ifeq ($(DUMA_CPP),1)
    14 +OBJECTS += dumapp.o
    15 +SO_OBJECTS += dumapp_so.o
    16 +endif
    17  
    18  all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
    19