Changeset f6b5593 in mainline for boot/arch/ia64/loader/Makefile

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:

• boot/arch/ia64/loader/Makefile (modified) (2 diffs)

boot/arch/ia64/loader/Makefile

@@ -51 +51 @@
 endif
 
-ifeq ($(COMPILER),icc_native)
+ifeq ($(COMPILER),icc)
         CC = icc
         AS = as
@@ -104 +104 @@
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat \
-        $(USPACEDIR)/srv/bd/file_bd/file_bd
+        $(USPACEDIR)/srv/bd/file_bd/file_bd \
+        $(USPACEDIR)/srv/part/mbr_part/mbr_part
 
 RD_APPS = \
+        $(USPACEDIR)/app/edit/edit \
         $(USPACEDIR)/app/getvc/getvc \
         $(USPACEDIR)/app/tetris/tetris \