Changeset 32b4302 in mainline for tools/xcw/bin/helenos-pkg-config

Timestamp:

2019-08-18T19:06:02Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

1c39d33b

Parents:

fa70134 (diff), 6c2fac18 (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:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-18 19:06:02)

git-committer:

GitHub <noreply@…> (2019-08-18 19:06:02)

Message:

Merge pull request #174 from le-jzr/meson3

Convert HelenOS build system to Meson

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"