diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-03-04 15:02:29 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-06-28 18:43:04 +0200 |
| commit | c9741726c1d3476beed071005770a71464f273b9 (patch) | |
| tree | de79f04ac3882271fce432c1c84a5a761a64cf16 /Configurations | |
| parent | 16b0e0fcb32f553b9302db997045950c6af5f805 (diff) | |
Configurations: drop toolchain from configuration targets
Some configuration targets pretend to be for a specific compiler, but
are more widely usable, and should reflect that.
[work in progress]
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11230)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 0313ad0a37..c30954f27d 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1577,7 +1577,8 @@ my %targets = ( # Option "freeze" such as -std=gnu9x can't negatively interfere # with future defaults for below two targets, because MacOS X # for PPC has no future, it was discontinued by vendor in 2009. - "darwin-ppc-cc" => { + "darwin-ppc-cc" => { inherit_from => [ "darwin-ppc" ] }, # Historic alias + "darwin-ppc" => { inherit_from => [ "darwin-common" ], cflags => add("-arch ppc -std=gnu9x -Wa,-force_cpusubtype_ALL"), lib_cppflags => add("-DB_ENDIAN"), @@ -1585,7 +1586,8 @@ my %targets = ( asm_arch => 'ppc32', perlasm_scheme => "osx32", }, - "darwin64-ppc-cc" => { + "darwin64-ppc-cc" => { inherit_from => [ "darwin64-ppc" ] }, # Historic alias + "darwin64-ppc" => { inherit_from => [ "darwin-common" ], cflags => add("-arch ppc64 -std=gnu9x"), lib_cppflags => add("-DB_ENDIAN"), @@ -1593,7 +1595,8 @@ my %targets = ( asm_arch => 'ppc64', perlasm_scheme => "osx64", }, - "darwin-i386-cc" => { + "darwin-i386-cc" => { inherit_from => [ "darwin-i386" ] }, # Historic alias + "darwin-i386" => { inherit_from => [ "darwin-common" ], CFLAGS => add(picker(release => "-fomit-frame-pointer")), cflags => add("-arch i386"), @@ -1602,7 +1605,8 @@ my %targets = ( asm_arch => 'x86', perlasm_scheme => "macosx", }, - "darwin64-x86_64-cc" => { + "darwin64-x86_64-cc" => { inherit_from => [ "darwin64-x86_64" ] }, # Historic alias + "darwin64-x86_64" => { inherit_from => [ "darwin-common" ], CFLAGS => add("-Wall"), cflags => add("-arch x86_64"), |