diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-27 12:58:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-27 12:58:54 -0300 |
| commit | 3c794eb6dfb7ce172ddcd4b5acdfabd660a29ffb (patch) | |
| tree | 0c0143a26e7c2ae2956237b1a76f681e374ec463 /tools/builder_common.sh | |
| parent | e0b07f6fa76917ee536f4a85396eabe5f2ec6b9a (diff) | |
| download | pfsense-3c794eb6dfb7ce172ddcd4b5acdfabd660a29ffb.zip pfsense-3c794eb6dfb7ce172ddcd4b5acdfabd660a29ffb.tar.gz | |
Export LOCAL_ITOOLS, same variable used by FreeBSD build tools
Diffstat (limited to 'tools/builder_common.sh')
| -rw-r--r-- | tools/builder_common.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index f2d9b7c..1ece80c 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -331,8 +331,8 @@ make_world() { echo ">>> LOGFILE set to $LOGFILE." | tee -a ${LOGFILE} makeargs="${MAKE_ARGS}" echo ">>> Building world for ${TARGET} architecture... (Starting - $(LC_ALL=C date))" | tee -a ${LOGFILE} - echo ">>> Builder is running the command: env LOCAL_ITOOLS=\"${EXTRA_TOOLS}\" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld" | tee -a ${LOGFILE} - (env LOCAL_ITOOLS="${EXTRA_TOOLS}" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} + echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld" | tee -a ${LOGFILE} + (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} buildworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Building world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} LOGFILE=${BUILDER_LOGS}/installworld.${TARGET} @@ -340,8 +340,8 @@ make_world() { # Create if cleaned up makeargs="${MAKE_ARGS} DESTDIR=${STAGE_CHROOT_DIR} WITHOUT_TOOLCHAIN=1" echo ">>> Installing world for ${TARGET} architecture... (Starting - $(LC_ALL=C date))" | tee -a ${LOGFILE} - echo ">>> Builder is running the command: env LOCAL_ITOOLS=\"${EXTRA_TOOLS}\" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld" | tee -a ${LOGFILE} - (env LOCAL_ITOOLS="${EXTRA_TOOLS}" script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} + echo ">>> Builder is running the command: script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld" | tee -a ${LOGFILE} + (script -aq $LOGFILE make -C ${FREEBSD_SRC_DIR} ${makeargs} installworld || print_error_pfS;) | egrep '^>>>' | tee -a ${LOGFILE} echo ">>> Installing world for ${TARGET} architecture... (Finished - $(LC_ALL=C date))" | tee -a ${LOGFILE} makeargs="${MAKE_ARGS} DESTDIR=${STAGE_CHROOT_DIR}" |
