From 9f00f602b4c5ea111a9c65d55c1d304cee49878d Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 5 Nov 2022 12:11:28 -0600 Subject: [PATCH] Temporary fix for osxcross build until osxcross is fixed. #22 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c615b09..c31754c 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ export JOBS_CT_NG := endif RACK_SDK_VERSION := 2.1.2 -DOCKER_IMAGE_VERSION := 4 +DOCKER_IMAGE_VERSION := 5 all: toolchain-all @@ -63,8 +63,11 @@ MAC_BINUTILS_VERSION := 2.37 $(toolchain-mac): export PATH := $(LOCAL_DIR)/osxcross/bin:$(PATH) $(toolchain-mac): # Download osxcross - git clone "https://github.com/tpoechtrager/osxcross.git" osxcross - cd osxcross && git checkout 0f87f567dfaf98460244471ad6c0f4311d62079c + #git clone "https://github.com/tpoechtrager/osxcross.git" osxcross + #cd osxcross && git checkout 0f87f567dfaf98460244471ad6c0f4311d62079c + # FIXME Switch to my own branch for now until clang build fix is merged into osxcross + git clone "https://github.com/cschol/osxcross.git" osxcross + cd osxcross && git checkout 70181533b0af841336feb7f74ca1e3a7a81c9065 # Build clang cd osxcross && UNATTENDED=1 DISABLE_BOOTSTRAP=1 INSTALLPREFIX="$(LOCAL_DIR)" CLANG_VERSION=$(MAC_CLANG_VERSION) OCDEBUG=1 JOBS=$(JOBS) ./build_clang.sh