diff options
| -rw-r--r-- | subr/pre_subdirs.subr | 1 | ||||
| -rw-r--r-- | vars/build.vars | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/subr/pre_subdirs.subr b/subr/pre_subdirs.subr index 3a174f14..bc205032 100644 --- a/subr/pre_subdirs.subr +++ b/subr/pre_subdirs.subr @@ -22,6 +22,7 @@ pre_subdirs() { /=${PREFIX_CROSS} \ /=${PREFIX_MINIPIX}/bin \ /=${PREFIX_NATIVE} \ + /=${PREFIX_NATIVE}/${TARGET}/lib \ @.=${PREFIX}/usr \ @.=${PREFIX}/x86_64-w64-mingw32/mingw \ /=${PREFIX}/x86_64-w64-mingw32/mingw/include \ diff --git a/vars/build.vars b/vars/build.vars index fc423521..52d0d979 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -142,6 +142,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_PSXTYPES_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_CROSS}"}; : ${PKG_PSXTYPES_HOST_SUBDIR:=psxtypes}; : ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${GITROOT}/pemagine}; +: ${PKG_LDSO_HOST_BUILD_TYPE:=cross}; : ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"}; : ${PKG_LDSO_HOST_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET} --disable-shared"}; : ${PKG_LDSO_HOST_INSTALL_FILES:="@../${TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"}; @@ -239,7 +240,7 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_LDSO_URLS_GIT:=pemagine=${GITROOT}/pemagine}; : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"}; : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared}; -: ${PKG_LDSO_INSTALL_FILES:="@libldso.a=${TARGET}/lib/libldso.a"}; +: ${PKG_LDSO_INSTALL_FILES:="@../../lib/libldso.a=${TARGET}/lib/libldso.a"}; : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a}; : ${PKG_LDSO_SUBDIR:=pemagine}; |