Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Darwin workaround and use Darwin xar #331

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove Darwin workaround and use Darwin xar #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90d3f9f
tools.sh: remove Darwin workaround
Gcenx Mar 16, 2022
64d99db
build.sh: Don’t build xar on Darwin
Gcenx Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ if [ "$SDK_VERSION" != "$OLD_SDK_VERSION" ]; then
fi

# XAR

build_xar
if [[ $PLATFORM != Darwin ]]; then
build_xar
fi

# XAR END

Expand Down Expand Up @@ -128,7 +129,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
Expand Down
9 changes: 0 additions & 9 deletions tools/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down