summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-09-22 19:59:37 +0300
committerTor Lillqvist <tml@collabora.com>2013-09-23 00:54:43 +0300
commit4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch)
treeeac7091c6fa969ed652f8ae23d775b13a30b2b66 /jvmfwk
parentb5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff)
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/Package_jreproperties.mk2
-rw-r--r--jvmfwk/Package_rcfiles.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index e70d57b6d0bf..96f246c17121 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/jvmfwk/Package_jreproperties.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
-$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(INSTROOT)))
$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class))
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 772ffd6d1689..ac7757d3731f 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk))
-$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTROOT)))
ifneq ($(OS),WNT)
ifeq ($(OS),FREEBSD)