Changeset 84876aa4 in mainline for tools/xcw/bin/helenos-cc

Timestamp:

2019-11-15T13:46:34Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master into gfx

Mainly to get XCW fixes

File:

• tools/xcw/bin/helenos-cc (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