summaryrefslogtreecommitdiff
path: root/toolchain/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'toolchain/Makefile')
-rw-r--r--toolchain/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile
index a66791df0..fe16fc6af 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
TARGETS:=binutils gmp mpfr gcc
ifeq ($(ADK_TARGET_LIB_GLIBC),y)
-TARGETS+=glibc
+TARGETS+=glibc-ports glibc
LIBC:=glibc
endif
ifeq ($(ADK_TARGET_LIB_EGLIBC),y)
@@ -38,7 +38,15 @@ clean: $(TARGETS_CLEAN)
download: $(DOWNLOAD)
gcc-prepare: binutils-install gmp-install mpfr-install
+<<<<<<< HEAD
+ifeq ($(ADK_TARGET_LIB_GLIBC),y)
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare glibc-ports-prepare
+else
+$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
+endif
+=======
$(LIBC)-prepare: gcc-prepare kernel-headers-prepare
+>>>>>>> 92de2ee1c2848fe50b9908bb679e0c9edcd4a867
gcc-configure: $(LIBC)-prepare
$(LIBC)-compile: gcc-configure
gcc-compile: $(LIBC)-install