comparison make/windows/create_obj_files.sh @ 4877:c03e06373b47

Merge
author stefank
date Sat, 28 Jan 2012 01:15:34 -0800
parents 94ec88ca68e2
children 51612f0c0a79
comparison
equal deleted inserted replaced
4876:be649fefcdc2 4877:c03e06373b47
70 fi 70 fi
71 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}" 71 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}"
72 done 72 done
73 73
74 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles" 74 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles"
75
76 if [ -d "${ALTSRC}/share/vm/jfr" ]; then
77 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/agent"
78 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/agent/isolated_deps/util"
79 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/jvm"
80 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr"
81 fi
75 82
76 CORE_PATHS="${BASE_PATHS}" 83 CORE_PATHS="${BASE_PATHS}"
77 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS. 84 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS.
78 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then 85 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then
79 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" 86 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"