Mercurial > hg > truffle

comparison make/windows/create_obj_files.sh @ 6154:5142b5110214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Tue, 08 May 2012 07:29:27 -0700
parents 51612f0c0a79
children da91efe96a93
comparison
equal deleted inserted replaced
6153:aa07e41a9f80 6154:5142b5110214
78 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/agent/isolated_deps/util" 78 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/agent/isolated_deps/util"
79 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/jvm" 79 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/jvm"
80 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr" 80 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr"
81 fi 81 fi
82 82
83 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods"
84
83 CORE_PATHS="${BASE_PATHS}" 85 CORE_PATHS="${BASE_PATHS}"
84 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS. 86 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS.
85 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then 87 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then
86 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" 88 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
87 fi 89 fi