Changeset 8b863a62 in mainline for boot/Makefile.build


Ignore:
Timestamp:
2014-04-16T17:14:06Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f857e8b
Parents:
dba3e2c (diff), 70b570c (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:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    rdba3e2c r8b863a62  
    7575endif
    7676
     77ifeq ($(COMPILER),gcc_helenos)
     78        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     79        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     80endif
     81
     82
    7783ifeq ($(COMPILER),icc)
    7884        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
Note: See TracChangeset for help on using the changeset viewer.