diff options
| author | Gunnar Beutner <gunnar@beutner.name> | 2021-04-14 20:32:43 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-04-14 21:46:20 +0200 |
| commit | 6ac7d946be8e0d3dbe0a7238a8462c4634e042d8 (patch) | |
| tree | d1a451e91cbc8da5bc79afbc77a5299d347e12a0 /Ports | |
| parent | b02f215ca7aa5a9a338ee06066a40c16fa6f0a27 (diff) | |
| download | serenity-6ac7d946be8e0d3dbe0a7238a8462c4634e042d8.zip | |
Ports: Don't export the DESTDIR variable by default
Exporting DESTDIR interferes with cmake-based ports:
Install the project...
-- Install configuration: ""
-- Up-to-date: /home/gunnar/serenity/Build/i686/Root/home/gunnar/serenity/Build/i686/Root/usr/lib/libSDL2.a
-- Up-to-date: /home/gunnar/serenity/Build/i686/Root/home/gunnar/serenity/Build/i686/Root/usr/lib/libSDL2-2.0.a
-- Up-to-date: /home/gunnar/serenity/Build/i686/Root/home/gunnar/serenity/Build/i686/Root/usr/lib/libSDL2main.a
-- Up-to-date: /home/gunnar/serenity/Build/i686/Root/home/gunnar/serenity/Build/i686/Root/usr/lib/cmake/SDL2/SDL2Targets.cmake
Diffstat (limited to 'Ports')
| -rw-r--r-- | Ports/.hosted_defs.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Ports/.hosted_defs.sh b/Ports/.hosted_defs.sh index eeec19dc2d..de8d3b92ec 100644 --- a/Ports/.hosted_defs.sh +++ b/Ports/.hosted_defs.sh @@ -1,5 +1,4 @@ #!/usr/bin/env bash - export SERENITY_ROOT="$(realpath "${SCRIPT}/../")" export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}" export CC="${SERENITY_ARCH}-pc-serenity-gcc" @@ -7,7 +6,8 @@ export CXX="${SERENITY_ARCH}-pc-serenity-g++" export AR="${SERENITY_ARCH}-pc-serenity-ar" export RANLIB="${SERENITY_ARCH}-pc-serenity-ranlib" export PATH="${SERENITY_ROOT}/Toolchain/Local/${SERENITY_ARCH}/bin:${PATH}" -export DESTDIR="${SERENITY_BUILD_DIR}/Root" export PKG_CONFIG_DIR="" export PKG_CONFIG_SYSROOT_DIR="${SERENITY_BUILD_DIR}/Root" export PKG_CONFIG_LIBDIR="${PKG_CONFIG_SYSROOT_DIR}/usr/lib/pkgconfig/:${PKG_CONFIG_SYSROOT_DIR}/usr/local/lib/pkgconfig" + +DESTDIR="${SERENITY_BUILD_DIR}/Root" |