From 18acc41244b31aecb1d6b95dffa903f76caf9147 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 20 May 2019 18:14:51 -0400 Subject: build: Rearrange options to shorten by 1 line --- (limited to 'build') diff --git a/build b/build index 5486dc0..c3cb5ff 100755 --- a/build +++ b/build @@ -45,16 +45,16 @@ common_opts = \ --with-nls \ --with-sysroot="$${OPK_SYSROOT}" \ --disable-libquadmath \ - $(target_opts) + $(target_opts) \ + $(extra_opts) full_opts = \ - $(common_opts) \ --enable-shared \ --enable-threads=posix \ --enable-languages=c,c++ + $(common_opts) bootstrap1_opts = \ - $(common_opts) \ --without-headers \ --with-newlib \ --disable-shared \ @@ -62,6 +62,7 @@ bootstrap1_opts = \ --enable-languages=c,c++ \ --disable-libgomp \ --disable-libssp + $(common_opts) # Abbreviation for build-gcc-config tm = src/gcc/config @@ -109,12 +110,10 @@ configure-native configure-cross: set -e; \ if [ 'x$(OPK_HOST_PLAT)' = 'xbootstrap1' ]; then \ oh-autoconfigure -B "$(builddir)" -t "$(target)" -- \ - $(bootstrap1_opts) \ - $(extra_opts); \ + $(bootstrap1_opts); \ else \ oh-autoconfigure -B "$(builddir)" -t "$(target)" -- \ - $(full_opts) \ - $(extra_opts); \ + $(full_opts); \ fi # This rule sets (host- and) target-dependent paths in files in gcc/config. -- cgit v0.9.1