Mercurial > hg > release > icedtea6-1.2
changeset 778:fc06aaf1e991
2008-03-27 Gary Benson <gbenson@redhat.com>
* Makefile.am
(stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken cacao
detection.
| author | Gary Benson <gbenson@redhat.com> |
|---|---|
| date | Thu, 27 Mar 2008 08:58:31 +0000 |
| parents | 4749fccc0859 |
| children | e92bc60d59b8 |
| files | ChangeLog Makefile.am Makefile.in |
| diffstat | 3 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 26 06:44:13 2008 -0400 +++ b/ChangeLog Thu Mar 27 08:58:31 2008 +0000 @@ -1,3 +1,9 @@ +2008-03-27 Gary Benson <gbenson@redhat.com> + + * Makefile.am + (stamps/ports.stamp, stamps/ports-ecj.stamp): Fixed broken cacao + detection. + 2008-03-26 Gary Benson <gbenson@redhat.com> * patches/icedtea-zero-build.patch: Added zero-specific bits to
--- a/Makefile.am Wed Mar 26 06:44:13 2008 -0400 +++ b/Makefile.am Thu Mar 27 08:58:31 2008 +0000 @@ -199,11 +199,11 @@ ln -sf $$PWD/$$target $$link; \ done ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux - if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \ mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \ ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \ fi - if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \ ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ fi mkdir -p stamps @@ -363,11 +363,11 @@ ln -sf $$PWD/$$target $$link; \ done ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux - if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \ mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \ ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \ fi - if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \ ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ fi mkdir -p stamps
--- a/Makefile.in Wed Mar 26 06:44:13 2008 -0400 +++ b/Makefile.in Thu Mar 27 08:58:31 2008 +0000 @@ -776,11 +776,11 @@ ln -sf $$PWD/$$target $$link; \ done ln -sf $$PWD/platform_zero openjdk/hotspot/build/linux - if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \ mkdir -p openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \ ln -sf $$PWD/jvm.cfg openjdk/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \ fi - if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \ ln -sf $$PWD/ergo.c openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ fi mkdir -p stamps @@ -862,11 +862,11 @@ ln -sf $$PWD/$$target $$link; \ done ln -sf $$PWD/platform_zero openjdk-ecj/hotspot/build/linux - if ! test "x$(CORE_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(CORE_BUILD)$(CACAO)" = "xno"; then \ mkdir -p openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR); \ ln -sf $$PWD/jvm.cfg openjdk-ecj/jdk/src/solaris/bin/$(BUILD_ARCH_DIR)/jvm.cfg; \ fi - if ! test "x$(ZERO_BUILD)$(WITH_CACAO)" = "xno"; then \ + if ! test "x$(ZERO_BUILD)$(CACAO)" = "xno"; then \ ln -sf $$PWD/ergo.c openjdk-ecj/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ fi mkdir -p stamps