diff options
| author | Zach van Rijn <me@zv.io> | 2024-08-05 16:53:07 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2024-08-05 16:55:47 -0500 |
| commit | f2a6930b30878a857f5798de33572cb7d9f34685 (patch) | |
| tree | d8160cb5bb466dd08078b501bd1a8380313d03e2 | |
| parent | 57ca620b39de136423784e4328732b2b5f36251b (diff) | |
| download | bootstrap-f2a6930b30878a857f5798de33572cb7d9f34685.tar.gz bootstrap-f2a6930b30878a857f5798de33572cb7d9f34685.tar.bz2 bootstrap-f2a6930b30878a857f5798de33572cb7d9f34685.tar.xz bootstrap-f2a6930b30878a857f5798de33572cb7d9f34685.zip | |
bootstrap: s/GCC_CONFIG_FOR_TARGET/GCC_CONFIG
The 'config.mak' that is generated by the upstream
'bootstrap' script (not this one) uses GCC_CONFIG,
but we might want to replace or override it.
The GCC_CONFIG_FOR_TARGET variable is not evaluated
after GCC_CONFIG, so it is unsuitable toward that end.
| -rwxr-xr-x | bootstrap | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -446,44 +446,44 @@ if ! test -d "${MTOOLS}"/sys/emus/bin; then # FIXME: no hard code # supported targets ifneq ($(findstring aarch64-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 +GCC_CONFIG += --with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 endif ifneq ($(findstring armv7l-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb +GCC_CONFIG += --with-arch=armv7-a --with-tune=generic-armv7-a --with-fpu=vfpv3-d16 --with-float=hard --with-abi=aapcs-linux --with-mode=thumb endif ifneq ($(findstring powerpc64-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --enable-secureplt --enable-decimal-float=no --with-abi=elfv2 +GCC_CONFIG += --enable-secureplt --enable-decimal-float=no --with-abi=elfv2 endif ifneq ($(findstring powerpc-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --enable-secureplt --enable-decimal-float=no +GCC_CONFIG += --enable-secureplt --enable-decimal-float=no endif ifneq ($(findstring x86_64-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += +GCC_CONFIG += endif ifneq ($(findstring i586-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=i586 --with-tune=pentium2 --enable-cld --enable-mmx +GCC_CONFIG += --with-arch=i586 --with-tune=pentium2 --enable-cld --enable-mmx endif # experimental targets ifneq ($(findstring m68k-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=m68k --with-cpu=m68020 +GCC_CONFIG += --with-arch=m68k --with-cpu=m68020 endif ifneq ($(findstring mips64-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-abi=64 --with-mips-plt +GCC_CONFIG += --with-abi=64 --with-mips-plt endif ifneq ($(findstring riscv64-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic +GCC_CONFIG += --with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic endif ifneq ($(findstring s390x-,$(TARGET)),) -GCC_CONFIG_FOR_TARGET += --with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float +GCC_CONFIG += --with-arch=z196 --with-tune=zEC12 --with-zarch --with-long-double-128 --enable-decimal-float endif EOF sed -i "${MTOOLS}"/config.mak \ |