summaryrefslogtreecommitdiff
path: root/external
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 /external
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 'external')
-rw-r--r--external/Package_mingw_dlls.mk2
-rw-r--r--external/Package_msvc_dlls.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk
index 3b0f2b9a0a35..c85032a3c60e 100644
--- a/external/Package_mingw_dlls.mk
+++ b/external/Package_mingw_dlls.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
-$(eval $(call gb_Package_set_outdir,mingw_dlls,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT)))
$(eval $(call gb_Package_add_files,mingw_dlls,bin,\
$(sort $(MINGW_DLLS)) \
diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk
index 47896f045b54..dd68f10c4f95 100644
--- a/external/Package_msvc_dlls.mk
+++ b/external/Package_msvc_dlls.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
-$(eval $(call gb_Package_set_outdir,msvc_dlls,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTROOT)))
$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\
$(MSVC_DLLS) \