Changeset b535aeb in mainline for uspace/lib/libc/Makefile.toolchain

Timestamp:

2010-03-20T22:02:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

37f527b

Parents:

39e8406 (diff), 4e9aaf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/libc/Makefile.toolchain (modified) (5 diffs)

uspace/lib/libc/Makefile.toolchain

@@ -53 +53 @@
 AFLAGS =
 
-## Cross-toolchain prefix
-#
-
-ifndef CROSS_PREFIX
-        CROSS_PREFIX = /usr/local
-endif
-
 ## Setup platform configuration
 #
 
+-include $(LIBC_PREFIX)/../../../Makefile.common
 -include $(LIBC_PREFIX)/../../../Makefile.config
--include $(LIBC_PREFIX)/../../../config.defs
 -include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.inc
 
-## Simple detection of the host system
-#
-HOST = $(shell uname)
-
-## On Solaris, some utilities have different names
-#
-ifeq ($(HOST),SunOS)
-        BINUTILS_PREFIX = "g"
-else
-        BINUTILS_PREFIX = ""
-endif
-
-## Toolchain configuration
+## Compilation options
 #
 
@@ -85 +66 @@
 
 ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        GCC = $(CC)
-        AS = $(TOOLCHAIN_DIR)/$(TARGET)-as
-        LD = $(TOOLCHAIN_DIR)/$(TARGET)-ld
-        AR = $(TOOLCHAIN_DIR)/$(TARGET)-ar
-        OBJCOPY = $(TOOLCHAIN_DIR)/$(TARGET)-objcopy
-        OBJDUMP = $(TOOLCHAIN_DIR)/$(TARGET)-objdump
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -97 +71 @@
 
 ifeq ($(COMPILER),gcc_native)
-        CC = gcc
-        GCC = $(CC)
-        AS = $(BINUTILS_PREFIX)as
-        LD = $(BINUTILS_PREFIX)ld
-        AR = $(BINUTILS_PREFIX)ar
-        OBJCOPY = $(BINUTILS_PREFIX)objcopy
-        OBJDUMP = $(BINUTILS_PREFIX)objdump
         CFLAGS = $(GCC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -109 +76 @@
 
 ifeq ($(COMPILER),icc)
-        CC = icc
-        GCC = gcc
-        AS = as
-        LD = ld
-        AR = ar
-        OBJCOPY = objcopy
-        OBJDUMP = objdump
         CFLAGS = $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
@@ -121 +81 @@
 
 ifeq ($(COMPILER),clang)
-        CC = clang
-        GCC = gcc
-        AS = $(BINUTILS_PREFIX)as
-        LD = $(BINUTILS_PREFIX)ld
-        AR = $(BINUTILS_PREFIX)ar
-        OBJCOPY = $(BINUTILS_PREFIX)objcopy
-        OBJDUMP = $(BINUTILS_PREFIX)objdump
         CFLAGS = $(CLANG_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)