diff options
| author | Tim Schumacher <timschumi@gmx.de> | 2021-09-27 00:16:18 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-10-05 02:13:08 +0200 |
| commit | c07f91474de4088c4eccd45ccc6883a515439d69 (patch) | |
| tree | 19bdb4797935e826f638053ea8d4250bd453dd0a /Ports/gcc | |
| parent | e507cfcdb0cc3be9e8e3304952c81d4410e6b610 (diff) | |
| download | serenity-c07f91474de4088c4eccd45ccc6883a515439d69.zip | |
Ports: Make array-like settings actual arrays
We may need entries with spaces in makeopts, installopts, and
configopts, and at that point we should also convert depends and
auth_opts to avoid confusion.
Diffstat (limited to 'Ports/gcc')
| -rwxr-xr-x | Ports/gcc/package.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh index 23596aeaf1..49c33ba648 100755 --- a/Ports/gcc/package.sh +++ b/Ports/gcc/package.sh @@ -2,11 +2,11 @@ port=gcc version=11.2.0 useconfigure=true -configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared --enable-threads=posix" +configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-sysroot=/" "--with-build-sysroot=${SERENITY_INSTALL_ROOT}" "--with-newlib" "--enable-languages=c,c++" "--disable-lto" "--disable-nls" "--enable-shared" "--enable-default-pie" "--enable-host-shared" "--enable-threads=posix") files="https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b" -makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)" -installopts="DESTDIR=${SERENITY_INSTALL_ROOT} install-gcc install-target-libgcc install-target-libstdc++-v3" -depends="binutils" +makeopts=("all-gcc" "all-target-libgcc" "all-target-libstdc++-v3" "-j$(nproc)") +installopts=("DESTDIR=${SERENITY_INSTALL_ROOT}" "install-gcc" "install-target-libgcc" "install-target-libstdc++-v3") +depends=("binutils") auth_type="sha256" post_fetch() { @@ -14,11 +14,11 @@ post_fetch() { } build() { - run make $makeopts + run make "${makeopts[@]}" run find "./host-${SERENITY_ARCH}-pc-serenity/gcc/" -maxdepth 1 -type f -executable -exec strip --strip-debug {} \; || echo } install() { - run make $installopts + run make "${installopts[@]}" run ln -sf gcc "${SERENITY_INSTALL_ROOT}/usr/local/bin/cc" } |