mirror of
https://github.com/richfelker/musl-cross-make.git
synced 2025-04-20 07:54:59 +02:00
Merge d49ca4bfd7
into 2f1e820bed
This commit is contained in:
commit
7b579a9476
1
Makefile
1
Makefile
@ -139,6 +139,7 @@ gcc-$(GCC_VER)/build/.mcm_installed: gcc-$(GCC_VER)/build/.mcm_built
|
|||||||
|
|
||||||
musl/.mcm_cloned:
|
musl/.mcm_cloned:
|
||||||
test -d musl || git clone -b $(MUSL_TAG) git://git.musl-libc.org/musl musl
|
test -d musl || git clone -b $(MUSL_TAG) git://git.musl-libc.org/musl musl
|
||||||
|
cat patches/musl/* | ( cd musl && patch -p1 )
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
musl/.mcm_configured: musl/.mcm_cloned gcc-$(GCC_VER)/build0/.mcm_built
|
musl/.mcm_configured: musl/.mcm_cloned gcc-$(GCC_VER)/build0/.mcm_built
|
||||||
|
16
patches/musl/00-broken-mac-os-x-ar.diff
Normal file
16
patches/musl/00-broken-mac-os-x-ar.diff
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/Makefile b/Makefile
|
||||||
|
index ec54880..b048cbd 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -170,7 +170,11 @@ lib/libc.a: $(AOBJS)
|
||||||
|
|
||||||
|
$(EMPTY_LIBS):
|
||||||
|
rm -f $@
|
||||||
|
+ifeq ($(shell uname),Darwin)
|
||||||
|
+ touch $@
|
||||||
|
+else
|
||||||
|
$(AR) rc $@
|
||||||
|
+endif
|
||||||
|
|
||||||
|
lib/%.o: obj/crt/$(ARCH)/%.o
|
||||||
|
cp $< $@
|
Loading…
Reference in New Issue
Block a user