diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
| commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
| tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /toolchain/Makefile | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'toolchain/Makefile')
| -rw-r--r-- | toolchain/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/toolchain/Makefile b/toolchain/Makefile index 1555d7637..fe16fc6af 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -7,7 +7,7 @@ # 3) build and install gcc c compiler # 4) install kernel-headers # 5) install libc headers -# 6) build and install full gcc +# 6) build and install full gcc # 7) build and install full libc # 8) build and install gdb debugger @@ -38,11 +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 |