diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
| commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
| tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /solenv/gbuild/Library.mk | |
| parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (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 'solenv/gbuild/Library.mk')
| -rw-r--r-- | solenv/gbuild/Library.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index a09f48aac4b6..e0ad137a1cfd 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -30,9 +30,9 @@ # gb_Library_Library_platform gb_Library_LAYER_DIRS := \ - URELIB:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ - OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ - SHLXTHDL:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ + URELIB:$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) \ + OOO:$(INSTROOT)/$(gb_PROGRAMDIRNAME) \ + SHLXTHDL:$(INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \ OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \ NONE:$(gb_Library_DLLDIR) \ @@ -71,9 +71,9 @@ endef define gb_Library__Library_impl_copy $(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR)) -$(call gb_Package_set_outdir,Library_Copy_$(1),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTROOT)) $(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2)) -$(OUTDIR)/lib/$(notdir $(2)) : $(gb_INSTROOT)/$(2) +$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2) endef # Note: there may be targets in 3 different directories: the library itself, |