Changeset 1b9a853 in mainline

Timestamp:

2019-11-15T10:03:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc65b87

Parents:

e1abc964

git-author:

Jiri Svoboda <jiri@…> (2019-11-14 22:02:55)

git-committer:

Jiri Svoboda <jiri@…> (2019-11-15 10:03:37)

Message:

Fix XCW both manual case and when ran by HSCT

Location:

tools/xcw

Files:

• bin/helenos-cc (modified) (1 diff)
• bin/helenos-ld (added)
• demo/Makefile (modified) (1 diff)

tools/xcw/bin/helenos-cc

@@ -35 +35 @@
 
 XCW="$(dirname "$0")"
-SRC_ROOT="$XCW/../../.."
+BUILD_ROOT="$(dirname "$(dirname "$(dirname "$XCW")")")"
 if [ -z "$EXPORT_DIR" ]; then
-        EXPORT_DIR="$SRC_ROOT/build/dist"
+        EXPORT_DIR="$BUILD_ROOT/export"
 fi
 
 HELENOS_EXPORT_ROOT="$EXPORT_DIR"
 
-source "${EXPORT_DIR}/config/config.sh"
+source "${EXPORT_DIR}/config.sh"
 
 # CC is a compilation driver, so we should check which stage of compilation

tools/xcw/demo/Makefile

@@ -36 +36 @@
 #
 #    cd <helenos-source-dir>
-#    make distclean && make -j 4 PROFILE=amd64
-#    cd <helenos-source-dir>/tools/xcw/demo
-#    export PATH=$PATH:<helenos-source-dir>/tools/xcw/bin
+#    mkdir build
+#    cd build
+#    ../configure.sh
+#    ninja
+#    cd ../tools/xcw/demo
+#    export PATH=$PATH:<helenos-source-dir>/build/tools/xcw/bin
 #    make
 #