mirror of
https://github.com/tpoechtrager/osxcross.git
synced 2024-11-20 18:33:06 +03:00
Merge 64d99dbb43
into be6ffb3cbc
This commit is contained in:
commit
d980c0cd41
9
build.sh
9
build.sh
@ -109,8 +109,9 @@ if [ "$SDK_VERSION" != "$OLD_SDK_VERSION" ]; then
|
||||
fi
|
||||
|
||||
# XAR
|
||||
|
||||
build_xar
|
||||
if [[ $PLATFORM != Darwin ]]; then
|
||||
build_xar
|
||||
fi
|
||||
|
||||
# XAR END
|
||||
|
||||
@ -145,7 +146,9 @@ if [ $f_res -eq 1 ]; then
|
||||
if [ $NEED_TAPI_SUPPORT -eq 1 ]; then
|
||||
CONFFLAGS+="--with-libtapi=$TARGET_DIR "
|
||||
fi
|
||||
CONFFLAGS+="--with-libxar=$TARGET_DIR "
|
||||
if [[ $PLATFORM != Darwin ]]; then
|
||||
CONFFLAGS+="--with-libxar=$TARGET_DIR "
|
||||
fi
|
||||
[ -n "$DISABLE_CLANG_AS" ] && CONFFLAGS+="--disable-clang-as "
|
||||
[ -n "$DISABLE_LTO_SUPPORT" ] && CONFFLAGS+="--disable-lto-support "
|
||||
./configure $CONFFLAGS
|
||||
|
@ -50,15 +50,6 @@ if [[ $PLATFORM == CYGWIN* ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ $PLATFORM == Darwin ]]; then
|
||||
echo $PATH
|
||||
CFLAGS_OPENSSL="$(pkg-config --cflags openssl)"
|
||||
LDFLAGS_OPENSSL="$(pkg-config --libs-only-L openssl)"
|
||||
export C_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
|
||||
export CPLUS_INCLUDE_PATH=${CFLAGS_OPENSSL:2}
|
||||
export LIBRARY_PATH=${LDFLAGS_OPENSSL:2}
|
||||
fi
|
||||
|
||||
function require()
|
||||
{
|
||||
if ! command -v $1 &>/dev/null; then
|
||||
|
Loading…
Reference in New Issue
Block a user