Changeset 383ddd6 in mainline for uspace/Makefile


Ignore:
Timestamp:
2010-01-20T20:33:55Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
975e7e9
Parents:
6c01702 (diff), 3c081d0e (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

  • uspace/Makefile

    r6c01702 r383ddd6  
    8181        lib/libblock \
    8282        lib/softint \
    83         lib/softfloat
     83        lib/softfloat \
     84
     85ifeq ($(UARCH),amd64)
     86        LIBS += lib/libpci
     87endif
     88
     89ifeq ($(UARCH),ia32)
     90        LIBS += lib/libpci
     91endif
     92
    8493
    8594LIBC_BUILD = $(addsuffix .build,$(LIBC))
Note: See TracChangeset for help on using the changeset viewer.