Changeset 41f7564 in mainline for uspace


Ignore:
Timestamp:
2006-07-17T00:53:53Z (19 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
231fcb2
Parents:
41c4444
Message:

cleanup and unify the build system

Location:
uspace
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r41c4444 r41f7564  
    3030#
    3131
     32-include ../version
    3233-include Makefile.config
    3334
    … …  
    4849        DIRS += pci
    4950endif
     51
    5052ifeq ($(ARCH), ia32)
    5153        DIRS += pci
    5254endif
    5355
    54 CFLAGS += -DCONFIG_MIPS_FPU
     56ifeq ($(ARCH), mips32)
     57        CFLAGS += -DCONFIG_MIPS_FPU
     58endif
     59
     60ifeq ($(ARCH), mips32eb)
     61        CFLAGS += -DCONFIG_MIPS_FPU
     62endif
    5563
    5664BUILDS := $(addsuffix .build,$(DIRS))
    … …  
    6068
    6169all:
    62         tools/config.py default $(NARCH)
    63 ifdef NARCH
    64  ifneq ($(ARCH), $(NARCH))
    65         $(MAKE) -C . clean
    66  endif
    67 endif
     70        ../tools/config.py uspace.config default $(ARCH) $(COMPILER) $(CONFIG_DEBUG)
    6871        $(MAKE) -C . build
    6972
    7073config:
    71         tools/config.py
     74        ../tools/config.py uspace.config
    7275
    7376build: $(BUILDS)

  • uspace/uspace.config

    r41c4444 r41f7564  
    99@ "ppc32" PowerPC 32-bit
    1010@ "ppc64" PowerPC 64-bit
     11@ "sparc64" Sun UltraSPARC 64-bit
    1112! ARCH (choice)
    1213
    13 # IA32 Compiler
     14# Compiler
    1415@ "cross" Cross-compiler
    1516@ "native" Native
    16 ! [ARCH=ia32] IA32_COMPILER (choice)
    17 % [ARCH=ia32] SAVEAS IA32_COMPILER COMPILER
     17! COMPILER (choice)
    1818
    19 # PPC32 Compiler
    20 @ "cross" Cross-compiler
    21 @ "native" Native
    22 ! [ARCH=ppc32] PPC32_COMPILER (choice)
    23 % [ARCH=ppc32] SAVEAS PPC32_COMPILER COMPILER
    24 
    25 # PPC64 Compiler
    26 @ "cross" Cross-compiler
    27 @ "native" Native
    28 ! [ARCH=ppc64] PPC64_COMPILER (choice)
    29 % [ARCH=ppc64] SAVEAS PPC64_COMPILER COMPILER
    30 
    31 # MIPS FPU support
    32 ! [ARCH=mips32|ARCH=mips32eb] CONFIG_MIPS_FPU (n/y)
    33 
     19# General debuging and assert checking
     20! CONFIG_DEBUG (y/n)
Note: See TracChangeset for help on using the changeset viewer.