From 7c261d5b43b47d8aad968ffead93e9ba8cfed3a1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Nov 2018 20:44:29 +0100 Subject: [PATCH 1/2] rename the build target --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 496f836a..2e72aefe 100755 --- a/debian/rules +++ b/debian/rules @@ -360,7 +360,7 @@ VERBOSE=VERBOSE=1 # ninja #VERBOSE=-v -debian-stage2-build: +debian-full-build: $(PRE_[PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2 @@ -442,7 +442,7 @@ debian-libcxxabi-build: $(PRE_PROCESS_CONF) make $(NJOBS) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" touch $@ -override_dh_auto_build: debian-stage2-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build +override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build override_dh_prep: build_doc dh_prep @@ -801,4 +801,4 @@ override_dh_auto_clean: rm -f $(CURDIR)/clang/tools/clang-format/clang-format-$(LLVM_VERSION).py rm -rf libcxx/build libcxxabi/build -.PHONY: override_dh_strip preconfigure debian-stage2-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build +.PHONY: override_dh_strip preconfigure debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build From 0fc78cdf4ce0e24e78af757807e559864f51e36a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Nov 2018 20:45:54 +0100 Subject: [PATCH 2/2] fix a typo in PRE_PROCESS --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2e72aefe..bb4e2cbd 100755 --- a/debian/rules +++ b/debian/rules @@ -361,7 +361,7 @@ VERBOSE=VERBOSE=1 #VERBOSE=-v debian-full-build: - $(PRE_[PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2 + $(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 stage2 # Check the stage 2 build worked