Skip to content
Browse files

Fixes for building in zone.

  • Loading branch information...
1 parent 0124521 commit 3aeb937c7b1c15d3e681dc399af8fc986f4faba7 @joshwilsdon joshwilsdon committed Nov 11, 2010
Showing with 8 additions and 7 deletions.
  1. +4 −3 Makefile
  2. +2 −2 configure
  3. +2 −2 tools/build_illumos
View
7 Makefile
@@ -2,6 +2,7 @@
ROOT=$(PWD)
PROTO=$(ROOT)/proto
+PATH=/opt/local/bin:/opt/local/sbin:/opt/local/gcc34/bin:/usr/xpg4/bin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/openwin/bin:/opt/SUNWspro/bin:/usr/ccs/bin
world: 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp
@@ -18,16 +19,16 @@ update:
touch 0-illumos-stamp
0-extra-stamp:
- (cd $(ROOT)/projects/illumos-extras && /usr/ccs/bin/make DESTDIR=$(PROTO) && /usr/ccs/bin/make DESTDIR=$(PROTO) install)
+ (cd $(ROOT)/projects/illumos-extras && gmake DESTDIR=$(PROTO) && gmake DESTDIR=$(PROTO) install)
touch 0-extra-stamp
0-livesrc-stamp: src/bootparams.c
(cd $(ROOT)/src && gmake DESTDIR=$(PROTO) && gmake DESTDIR=$(PROTO) install)
touch 0-livesrc-stamp
clean:
- (cd $(ROOT)/src && /usr/ccs/bin/make clean)
- (cd $(ROOT)/projects/illumos-extras && /usr/ccs/bin/make clean)
+ (cd $(ROOT)/src && gmake clean)
+ (cd $(ROOT)/projects/illumos-extras && gmake clean)
(cd $(ROOT) && rm -rf $(PROTO))
(cd $(ROOT) && mkdir -p $(PROTO))
rm -f 0-*-stamp
View
4 configure
@@ -10,7 +10,7 @@ HAVE_PKG="true"
ROOTCMD=pfexec
# Load all site-specific configure files
-for file in `ls configure.*`; do
+for file in `ls configure.*`; do
source ${file}
done
@@ -95,7 +95,7 @@ echo "==> Populating projects/ directories..."
if [ ! -d "projects" ] ; then
echo "FATAL: unable to create projects/ directory."
exit 1
-fi
+fi
if [ ! -f "projects/illumos/usr/src/tools/env/illumos.sh" ]; then
echo " +--> Getting illumos source tree..."
View
4 tools/build_illumos
@@ -7,13 +7,13 @@
unset CC
unset CXX
ROOT=`pwd`
-export PATH=/opt/onbld/bin:/sbin:/usr/sbin:/usr/bin:/bin
+export PATH=/opt/onbld/bin:/sbin:/usr/sbin:/usr/bin:/usr/ccs/bin:/opt/SUNWspro/bin:/opt/local/bin
echo "==> Building Illumos"
cd ${ROOT}/projects/illumos
cp usr/src/tools/scripts/nightly ./nightly
-ksh93 ./usr/src/tools/scripts/bldenv.sh -d illumos.sh 'cd $CODEMGR_WS/usr/src && dmake setup && cd tools && dmake install'
+ksh93 ./usr/src/tools/scripts/bldenv.sh -d illumos.sh 'cd $CODEMGR_WS/usr/src && export PATH="$PATH:/opt/local/bin" && dmake setup && cd tools && dmake install'
time ./nightly illumos.sh
exit 0

0 comments on commit 3aeb937

Please sign in to comment.
Something went wrong with that request. Please try again.