Changeset b535aeb in mainline for boot/arch/ia64/loader/Makefile.build

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:

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

boot/arch/ia64/loader/Makefile.build

@@ -32 +32 @@
 
 include ../../../../version
+include ../../../../Makefile.common
 include ../../../../Makefile.config
-include ../../../../config.defs
 include Makefile.common
 include Makefile.toolchain
@@ -60 +60 @@
 $(OUTPUT): $(OBJECTS) $(COMPONENT_OBJECTS) $(LINK)
         $(LD) -no-check-sections -N -T $(LINK) $(COMPONENT_OBJECTS) $(OBJECTS) -o $@
-        $(MAKE) -C gefi/HelenOS PREFIX=$(GEFI_PREFIX)
+        $(MAKE) -C gefi/HelenOS
         cp gefi/HelenOS/hello.efi ../../../../
         cp gefi/HelenOS/image.bin ../../../../