Mercurial > hg > truffle
diff make/windows/makefiles/generated.make @ 383:99dd4bbd9eec
Merge
author | acorn |
---|---|
date | Tue, 30 Sep 2008 12:24:27 -0400 |
parents | 1ee8caae33af |
children | 0fc81f0a8ca8 |
line wrap: on
line diff
--- a/make/windows/makefiles/generated.make Fri Sep 26 13:33:15 2008 -0400 +++ b/make/windows/makefiles/generated.make Tue Sep 30 12:24:27 2008 -0400 @@ -50,7 +50,8 @@ $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge \ $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_shared \ $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_parNew \ - $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep + $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep \ + $(WorkSpace)/src/share/vm/gc_implementation/includeDB_gc_g1 IncludeDBs_core=$(IncludeDBs_base) $(IncludeDBs_gc) \ $(WorkSpace)/src/share/vm/includeDB_features