--- trunk/core/include/multilib.sminc 2008/10/10 13:29:42 2 +++ trunk/core/include/multilib.sminc 2008/12/22 11:33:39 307 @@ -61,7 +61,10 @@ export CC="gcc -${ABI}" export CXX="g++ -${ABI}" export ABI_LIBDIR="lib" - export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" + fi export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig" echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" @@ -69,7 +72,12 @@ echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + else + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + fi echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'" # configure a linux32 emulated build @@ -100,7 +108,10 @@ export CC="gcc -${ABI}" export CXX="g++ -${ABI}" export ABI_LIBDIR="lib64" - export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + export LDFLAGS="-L/${ABI_LIBDIR} -L/usr/${ABI_LIBDIR}" + fi export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig" echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}" @@ -108,7 +119,12 @@ echo -e "${COLBLUE}*** ${COLGREEN} CC${COLDEFAULT}='${CC}'" echo -e "${COLBLUE}*** ${COLGREEN} CXX${COLDEFAULT}='${CXX}'" echo -e "${COLBLUE}*** ${COLGREEN} ABI_LIBDIR${COLDEFAULT}='${ABI_LIBDIR}'" - echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + if [[ ${EXPORT_ABI_LDFLAGS} != false ]] + then + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${LDFLAGS}'" + else + echo -e "${COLBLUE}*** ${COLGREEN} LDFLAGS${COLDEFAULT}='${COLYELLOW}not exported${COLDEFAULT}'" + fi echo -e "${COLBLUE}*** ${COLGREEN} CHOST${COLDEFAULT}='${CHOST}'" echo -e "${COLBLUE}*** ${COLGREEN} PKG_CONFIG_PATH${COLDEFAULT}='${PKG_CONFIG_PATH}'"