Wed, 15 Dec 2010 05:43:54 -0800
7006659: temporary adlc files are added to the build variables
Summary: Don't recurse into sub-directories when looking for source files.
Reviewed-by: never, brutisso
1.1 --- a/make/linux/makefiles/vm.make Tue Dec 14 15:10:52 2010 -0500 1.2 +++ b/make/linux/makefiles/vm.make Wed Dec 15 05:43:54 2010 -0800 1.3 @@ -168,7 +168,9 @@ 1.4 1.5 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. 1.6 define findsrc 1.7 - $(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) )) 1.8 + $(notdir $(shell find $(1)/. ! -name . -prune \ 1.9 + -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ 1.10 + -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \))) 1.11 endef 1.12 1.13 Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
2.1 --- a/make/solaris/makefiles/vm.make Tue Dec 14 15:10:52 2010 -0500 2.2 +++ b/make/solaris/makefiles/vm.make Wed Dec 15 05:43:54 2010 -0800 2.3 @@ -184,7 +184,9 @@ 2.4 2.5 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. 2.6 define findsrc 2.7 - $(notdir $(shell find $(1) \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \) )) 2.8 + $(notdir $(shell find $(1)/. ! -name . -prune \ 2.9 + -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ 2.10 + -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \))) 2.11 endef 2.12 2.13 Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
3.1 --- a/make/windows/create_obj_files.sh Tue Dec 14 15:10:52 2010 -0500 3.2 +++ b/make/windows/create_obj_files.sh Wed Dec 15 05:43:54 2010 -0800 3.3 @@ -107,8 +107,12 @@ 3.4 "x86_64") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} *x86_32*" ;; 3.5 esac 3.6 3.7 +# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE. 3.8 function findsrc { 3.9 - $FIND ${1} \( -name \*.c -o -name \*.cpp -o -name \*.s \) -a \! \( -name ${Src_Files_EXCLUDE// / -o -name } \) | sed 's/.*\/\(.*\)/\1/'; 3.10 + $FIND ${1}/. ! -name . -prune \ 3.11 + -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \ 3.12 + -a \! \( -name ${Src_Files_EXCLUDE// / -o -name } \) \ 3.13 + | sed 's/.*\/\(.*\)/\1/'; 3.14 } 3.15 3.16 Src_Files=