diff options
| author | iain <iaholmes@microsoft.com> | 2019-08-05 19:07:20 +0300 |
|---|---|---|
| committer | Duncan Mak <duncan@yomigana> | 2019-08-12 18:50:07 +0300 |
| commit | 27868701d84b08ac636a809090eaaa5c3d46cbad (patch) | |
| tree | 1742fb6db572e1211aad8076217bc2f2a564d7fa /main/build/MacOSX/Makefile.am | |
| parent | 49a75765ae703d25533db95a6aeb9ebc8d07cf2b (diff) | |
[MacOS] Specify dlopen library paths (#8336)
* [MacOS] Specify dlopen library paths
With the hardened runtime, we now need to specify the paths of all libraries
that are dlopened in the binary's rpath
* Remove the spaces in the plist
The plist parser doesn't appear to like <true />, only <true/>
Diffstat (limited to 'main/build/MacOSX/Makefile.am')
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index 681963df71..3c733b83b6 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -27,6 +27,10 @@ EXTRA_DIST = dmg-bg.png DS_Store Info.plist.in make-dmg-bundle.sh render.cs MONOSTUB_EXTRA_SOURCEFILES = monostub-utils.h export MACOSX_DEPLOYMENT_TARGET=10.12 +# With the hardened runtime, we need to specify the location of all libraries +# that we dlopen +MONOSTUB_RPATH=-Wl,-rpath,/Library/Frameworks/Mono.framework/Libraries/ -Wl,-rpath,@executable_path/../Resources/lib/monodevelop/bin/ + all: monostub monostub-nogui monostub-test render.exe: render.cs @@ -42,12 +46,12 @@ monostub-nogui.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES) g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m$(MONOSTUB_ARCH) -o $@ monostub.mm monostub: monostub.o $(MONOSTUB_STATIC_LINK) - clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup + clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) mkdir -p ../bin cp $@ ../bin/MonoDevelop monostub-nogui: monostub-nogui.o $(MONOSTUB_STATIC_LINK) - clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup + clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) mkdir -p ../bin cp $@ ../bin/mdtool |