@@ -327,6 +327,9 @@ missing_make_config_paths := $(shell \
327327$(foreach path, $(missing_make_config_paths), \
328328 $(warning Warning: $(path) does not exist))
329329
330+ # This (the first rule) must depend on "all".
331+ default : all
332+
330333ifeq ($(PLATFORM ) , OS_AIX)
331334# no debug info
332335else ifneq ($(PLATFORM), IOS)
@@ -485,9 +488,6 @@ ifdef ROCKSDB_MODIFY_NPHASH
485488 PLATFORM_CXXFLAGS += -DROCKSDB_MODIFY_NPHASH=1
486489endif
487490
488- # This (the first rule) must depend on "all".
489- default : all
490-
491491WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \
492492 -Wunused-parameter
493493
@@ -1045,7 +1045,7 @@ check_0:
10451045 awk -v s=$(CI_SHARD_INDEX ) -v n=$(CI_TOTAL_SHARDS ) ' (NR-1)%n==s' ; \
10461046 else cat; fi ; \
10471047 fi ; \
1048- find t -name ' run-*' -print; \
1048+ $( FIND ) t -name ' run-*' -print; \
10491049 } \
10501050 | $(prioritize_long_running_tests ) \
10511051 | grep -E ' $(tests-regexp)' \
@@ -1067,7 +1067,7 @@ valgrind_check_0:
10671067 ' run "make watch-log" in a separate window' ' ' ; \
10681068 { \
10691069 printf ' ./%s\n' $(filter-out $(PARALLEL_TEST ) % skiplist_test options_settable_test, $(TESTS ) ) ; \
1070- find t -name ' run-*' -print; \
1070+ $( FIND ) t -name ' run-*' -print; \
10711071 } \
10721072 | $(prioritize_long_running_tests ) \
10731073 | grep -E ' $(tests-regexp)' \
@@ -1285,11 +1285,17 @@ clean-not-downloaded: clean-ext-libraries-bin clean-rocks clean-not-downloaded-r
12851285
12861286clean-rocks :
12871287# Not practical to exactly match all versions/variants in naming (e.g. debug or not)
1288- rm -f ${LIBNAME}*.so* ${LIBNAME}*.a
1289- rm -f $(BENCHMARKS) $(TOOLS) $(TESTS) $(PARALLEL_TEST) $(MICROBENCHS)
1290- rm -rf $(CLEAN_FILES) ios-x86 ios-arm scan_build_report
1291- $(FIND) . -name "*.[oda]" -exec rm -f {} \;
1292- $(FIND) . -type f \( -name "*.gcda" -o -name "*.gcno" \) -exec rm -f {} \;
1288+ @echo Removing link targets
1289+ @rm -f ${LIBNAME}*.so* ${LIBNAME}*.a $(BENCHMARKS) $(TOOLS) $(TESTS) $(PARALLEL_TEST) $(MICROBENCHS)
1290+ @echo Finding and cleaning other files
1291+ @rm -rf $(CLEAN_FILES) ios-x86 ios-arm scan_build_report
1292+ @if $(FIND) Makefile -regextype awk &> /dev/null; then \
1293+ $(FIND) . -regextype awk \
1294+ -regex '.*/([.].*|third-party)' -prune -o \
1295+ -type f -regex '.*[.]([oda]|gcda|gcno)' -exec rm -f {} \; ; \
1296+ else \
1297+ $(FIND) . -name "*.[oda]" -exec rm -f {} \; ; \
1298+ fi
12931299
12941300clean-rocksjava : clean-rocks
12951301 rm -rf jl jls
@@ -1302,7 +1308,7 @@ clean-ext-libraries-all:
13021308 rm -rf bzip2* snappy* zlib* lz4* zstd*
13031309
13041310clean-ext-libraries-bin :
1305- find . -maxdepth 1 -type d \( -name bzip2\* -or -name snappy\* -or -name zlib\* -or -name lz4\* -or -name zstd\* \) -prune -exec rm -rf {} \;
1311+ $( FIND ) . -maxdepth 1 -type d \( -name bzip2\* -or -name snappy\* -or -name zlib\* -or -name lz4\* -or -name zstd\* \) -prune -exec rm -rf {} \;
13061312
13071313tags :
13081314 ctags -R .
0 commit comments