Changeset 2190 in kBuild for trunk

Timestamp:

Jan 5, 2009 3:27:48 AM (16 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.

Location:

trunk

Files:

• Config.kmk (modified) (4 diffs)
• bootstrap.gmk (modified) (1 diff)

trunk/Config.kmk

@@ -139 +139 @@
 TEMPLATE_BIN_CFLAGS.release     = -O3
 TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024 -g
- ifdef NIX_INSTALL_DIR
+ if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
@@ -164 +164 @@
  endif
  TEMPLATE_BIN_LDFLAGS.profile   = -pg
- ifdef NIX_INSTALL_DIR
+ if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
   TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
  else
@@ -209 +209 @@
   #     $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
  endif
- ifdef NIX_INSTALL_DIR
+ if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
   TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
  else
@@ -254 +254 @@
   TEMPLATE_BIN_LDFLAGS         += -Wl,-i
  endif
- ifdef NIX_INSTALL_DIR
+ if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
   TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
  else

trunk/bootstrap.gmk

@@ -216 +216 @@
                 $(SRCDIR)/src/sed/config.h.$(KBUILD_TARGET) \
                 $(OUTDIR)/kmk/kmk
-        $(OUTDIR)/kmk/kmk -C $(SRCDIR)
+        $(OUTDIR)/kmk/kmk -C $(SRCDIR) KBUILD_BOOTSTRAP=1
         echo done > $@
 
 $(OUTDIR)/ts-stage2-install: $(OUTDIR)/ts-stage2-build
-        $(OUTDIR)/kmk/kmk -C $(SRCDIR) PATH_INS=$(SRCDIR) install
+        $(OUTDIR)/kmk/kmk -C $(SRCDIR) KBUILD_BOOTSTRAP=1 PATH_INS=$(SRCDIR) install
         echo done > $@