diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-12 12:29:09 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-12 14:32:01 +0200 |
| commit | 7fa4845a6f30fb1f49d00c62f97be425b06e48f4 (patch) | |
| tree | 7ec94ae3ca9c04162bfba8c2e70757434b500a9d | |
| parent | 9bc7194ebb20969b0097a242eedeae64c6d6e2d2 (diff) | |
No more use of MACOSX_SDK_VERSION outside configure.ac
...after <https://gerrit.libreoffice.org/60376> "Remove
Library_avmediaQuickTime, which is dead" and
<https://gerrit.libreoffice.org/60377> "Remove MACOSX_SDK_VERSION < 101200 code,
which is dead". (This commit can be reverted if MACOSX_SDK_VERSION ever needs
to be used again in makefiles or source code.)
Change-Id: Iaff300d325e357f96c329cc84b3b37d91863d4b0
Reviewed-on: https://gerrit.libreoffice.org/60378
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 691ec809bbab..a7fc587c5570 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -381,7 +381,6 @@ export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_PACKAGE_SIGNING_IDENTITY=@MACOSX_PACKAGE_SIGNING_IDENTITY@ export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@ -export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ export MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=@MAC_OS_X_VERSION_MIN_REQUIRED_DOTS@ diff --git a/configure.ac b/configure.ac index 489ec023a120..c4130db293f5 100644 --- a/configure.ac +++ b/configure.ac @@ -2920,7 +2920,6 @@ if test $_os = Darwin -o $_os = iOS; then AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER]) fi AC_SUBST(MACOSX_SDK_PATH) -AC_SUBST(MACOSX_SDK_VERSION) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED) AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index be107371f123..4deed67e7d05 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -40,7 +40,6 @@ gb_OSDEFS := \ -DNO_PTHREAD_PRIORITY \ -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) \ -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) \ - -DMACOSX_SDK_VERSION=$(MACOSX_SDK_VERSION) \ $(LFS_CFLAGS) \ |