aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-10-04 16:27:08 -0700
committerAnders Broman <a.broman58@gmail.com>2017-10-06 04:33:55 +0000
commit6172627534168bb31415fa31a7cecdb15bcca4ab (patch)
tree3804d72fe123a3c0e9fb1137a662207a0d4f3a5d /m4
parentae794fc5f24e893b20f4161ac3cfb20e018e9b96 (diff)
Make osx-app.sh a configured file and remove Autotools targets.
Rename osx-app.sh to osx-app.sh.in and add the version to the plugin path at configure time. Instead up updating Autotools accordingly just remove the macOS packaging targets. gf61c381b5a removed support for Autotools in osx-app.sh and if anyone wants to build macOS packages I'd prefer that they use the same toolchain as the buildbot. Change-Id: Ide5205265bf8859a85b1afab68fa8f8285952bd3 Reviewed-on: https://code.wireshark.org/review/23839 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'm4')
-rw-r--r--m4/ws_osx.m45
1 files changed, 0 insertions, 5 deletions
diff --git a/m4/ws_osx.m4 b/m4/ws_osx.m4
index fa815f5722..0e19b22616 100644
--- a/m4/ws_osx.m4
+++ b/m4/ws_osx.m4
@@ -233,11 +233,6 @@ then
WS_LDFLAGS="-mmacosx-version-min=$deploy_target -isysroot $SDKPATH $WS_LDFLAGS"
#
- # Add a -sdkroot flag to use with osx-app.sh.
- #
- OSX_APP_FLAGS="-sdkroot $SDKPATH"
-
- #
# XXX - do we need this to build the Wireshark wrapper?
# XXX - is this still necessary with the -mmacosx-version-min
# flag being set?