diff options
author | Douglas Mencken <dougmencken@gmail.com> | 2014-07-07 14:18:12 -0400 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-07-11 14:42:57 +0000 |
commit | f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5 (patch) | |
tree | 486875e4a66478db581f37a50fb1a21baef38402 /external/openssl/UnpackedTarball_openssl.mk | |
parent | add adjustments for spinbuttons (diff) | |
download | core-f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5.tar.gz core-f4beadc6e28b812237e01e6f8f2c4afcf57bb4d5.zip |
avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
this fixes gcc: error: unrecognized command line option '-arch'
The '-arch' option is part of Apple's extensions to GCC, and it is uncompatible
with "vanilla" GCC from FSF. Also, we're not building "universal binaries".
Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/openssl/UnpackedTarball_openssl.mk')
-rw-r--r-- | external/openssl/UnpackedTarball_openssl.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index cf875f7ab6ad..8c3f419bace3 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ $(if $(filter MSC,$(COM)),external/openssl/openssl-1.0.1g-msvc2012-winxp.patch.1) \ $(if $(filter SOLARIS,$(OS)),external/openssl/opensslsol.patch) \ $(if $(filter IOS,$(OS)),external/openssl/opensslios.patch) \ + $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),external/openssl/opensslosxppc.patch) \ )) # vim: set noet sw=4 ts=4: |