Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan McGovern <alan@xamarin.com>2015-06-23 19:30:06 +0300
committerAlan McGovern <alan@xamarin.com>2015-06-23 19:30:06 +0300
commit63e8a4cd3c02c4a7d0905b0c5be3088c1a3188b8 (patch)
tree87d8b2cdf218c8dc8b964432fe93ee37a0d03e0d /Makefile
parent715d91a0dcba73bc0b6c5786c418918e2c351ffe (diff)
[build] Let fsharp compile in El Capitan
With El Capitan we will no longer be able to symlink our binaries in /usr/bin. As such we need to either use full paths to our binaries like 'xbuild' and 'nuget' or we need to ensure they are available in PATH by adding in the path to mono's bin dir. I opted for the latter. This fix is not the best way, so if someone else wants to implement this in a better way feel free.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index eea33ddd8c..1f190b35c5 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ CONFIG_MAKE=$(top_srcdir)/config.make
case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \
for dir in $(SUBDIRS); do \
case $$dir in \
- .) $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
- *) (cd $$dir && $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
+ .) PATH=$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin $(MAKE) $*-local || { final_exit="exit 1"; $$dk; };;\
+ *) (cd $$dir && PATH=$(PATH):/Library/Frameworks/Mono.framework/Versions/Current/bin $(MAKE) $*) || { final_exit="exit 1"; $$dk; };;\
esac \
done
$$final_exit