Changeset 2190 for trunk/Config.kmk


Ignore:
Timestamp:
Jan 5, 2009, 4:27:48 AM (17 years ago)
Author:
bird
Message:

bootstrap.gmk,Config.kmk: Don't use NIX_INSTALL_DIR as installation directory while bootstrapping (governed by KBUILD_BOOSTRAP), otherwise kBuild/env.sh won't find stuff afterwards.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r2044 r2190  
    139139TEMPLATE_BIN_CFLAGS.release     = -O3
    140140TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024 -g
    141  ifdef NIX_INSTALL_DIR
     141 if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
    142142TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
    143143 else
    … …  
    164164 endif
    165165 TEMPLATE_BIN_LDFLAGS.profile   = -pg
    166  ifdef NIX_INSTALL_DIR
     166 if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
    167167  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
    168168 else
    … …  
    209209  #     $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
    210210 endif
    211  ifdef NIX_INSTALL_DIR
     211 if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
    212212  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
    213213 else
    … …  
    254254  TEMPLATE_BIN_LDFLAGS         += -Wl,-i
    255255 endif
    256  ifdef NIX_INSTALL_DIR
     256 if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
    257257  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
    258258 else
Note: See TracChangeset for help on using the changeset viewer.