diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
| commit | e31e53467bb18e83a01b60881adf35fa8a54531d (patch) | |
| tree | 83272e7c4afeca0b4c1cf009678a12d1751e09f0 /package/openjdk | |
| parent | c228dba74d4b4536721f9537ad67ac70fd57afe0 (diff) | |
| parent | 6ac888a1e388ebd5e92f957b2c77f326ab197765 (diff) | |
fix merge conflict
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 2650341c5..62786add7 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -52,7 +52,7 @@ WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} PKG_SUBPKGS:= OPENJDK PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO PKGCD_ZERO:= zero-assembly backend -PKGCD_SHARK:= JIT backend +PKGCD_SHARK:= Shark JIT backend PKGCB_SHARK:= llvm PKGCD_CACAO:= Cacao JIT backend PKGCD_JAMVM:= JamVM backend |