Changeset 3e828ea in mainline for tools/xcw/bin/helenos-pkg-config

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• tools/xcw/bin/helenos-pkg-config (modified) (1 diff)

tools/xcw/bin/helenos-pkg-config

@@ -34 +34 @@
 XCW="$(dirname "$0")"
 SRC_ROOT="$XCW/../../.."
-UARCH="$("$XCW"/helenos-bld-config --uarch)"
 if [ -z "$EXPORT_DIR" ]; then
-        EXPORT_DIR="$SRC_ROOT/uspace/export"
+        EXPORT_DIR="$SRC_ROOT/build/dist"
 fi
 INCLUDE_DIR="$EXPORT_DIR/include"