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

Timestamp:

2009-09-21T11:53:03Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4098e38

Parents:

2f636b6 (diff), c1618ed (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) (3 diffs)

uspace/lib/libc/Makefile.toolchain

@@ -64 +64 @@
 #
 
+ifeq ($(COMPILER),gcc_cross)
+        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
+        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
+        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
+endif
+
 ifeq ($(COMPILER),gcc_native)
         CC = gcc
@@ -74 +84 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),icc)
         CC = icc
         AS = as
@@ -84 +94 @@
 endif
 
-ifeq ($(COMPILER),gcc_cross)
-        CC = $(TOOLCHAIN_DIR)/$(TARGET)-gcc
-        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
+ifeq ($(COMPILER),clang)
+        CC = clang
+        AS = $(BINUTILS_PREFIX)as
+        LD = $(BINUTILS_PREFIX)ld
+        AR = $(BINUTILS_PREFIX)ar
+        OBJCOPY = $(BINUTILS_PREFIX)objcopy
+        OBJDUMP = $(BINUTILS_PREFIX)objdump
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif