X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2FMakefile;h=d35b7a10aeb9f48a807b5b599be611ed1f886d45;hb=a80ff1384cdcc1b3bd766f7fc504e7f3af4134e7;hp=cc66eedf79c0aa4edf28fc6dbf62c034488d78ec;hpb=952ec0e0a68ccf5a4c3c00894bb26a25d80910a3;p=vpp.git diff --git a/build-root/Makefile b/build-root/Makefile index cc66eedf79c..d35b7a10aeb 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -243,11 +243,11 @@ TAG_PREFIX = $(if $(TAG),$(TAG)-) tag_var_with_added_space_fn = $(if $($(TAG)_TAG_$(1)),$($(TAG)_TAG_$(1)) ) # TAG=debug for debugging -debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_CFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC -debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_CXXFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC -debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -DFORTIFY_SOURCE=2 -march=$(MARCH) \ +debug_TAG_LDFLAGS = -g -O0 -DCLIB_DEBUG -march=$(MARCH) \ -fstack-protector-all -fPIC BUILD_PREFIX_package = build-$(TAG_PREFIX) @@ -416,7 +416,7 @@ find_filter += -and -not -path '*/.mu_build_*' find_newer_filtered_fn = \ (! -f $(1) \ || -n $(call find_newer_files_fn,$(1),$(3)) \ - || -n "`find -H $(2) \ + || -n "`find -L $(2) \ -type f \ -and -newer $(1) \ -and \( $(4) \) \ @@ -765,7 +765,7 @@ find_source_for_package = \ exit 1; \ fi ; \ $(call build_msg_fn,Fix file dates in $${g}/$(PACKAGE_SOURCE)) ; \ - (cd $${s} ; $(MU_BUILD_ROOT_DIR)/autowank --touch) ; \ + : the timestamp-adjustment script used to be invoked at this point ; \ fi ; \ s=`cd $${s} && pwd` ; \ $(call build_msg_fn,Source found in $${s})