From 7ef30d8fee521ae11d78aba120553cc8a2fff2a8 Mon Sep 17 00:00:00 2001 From: Anders Nissen Date: Fri, 9 Sep 2016 12:07:51 +0200 Subject: [PATCH 1/2] Corrected haxe paths for OS X 10.11+ --- src/hvm/platform/UnixConfig.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hvm/platform/UnixConfig.hx b/src/hvm/platform/UnixConfig.hx index cfec1ef..1d468ba 100644 --- a/src/hvm/platform/UnixConfig.hx +++ b/src/hvm/platform/UnixConfig.hx @@ -16,8 +16,8 @@ class UnixConfig implements PlatformConfig { hvmRepo = Sys.getEnv( 'HOME' ).addTrailingSlash() + '.hvm/'; // TODO: a better way to get these, check env variables or `path haxe` etc. - haxeBinary = '/usr/lib/haxe/haxe'; - stdLib = '/usr/lib/haxe/std/'; + haxeBinary = '/usr/local/lib/haxe/haxe'; + stdLib = '/usr/local/lib/haxe/std/'; } public function build() { From 33cc5e2d247716b1d930ee5657e813592dd511bd Mon Sep 17 00:00:00 2001 From: Anders Nissen Date: Fri, 9 Sep 2016 12:12:47 +0200 Subject: [PATCH 2/2] Update paths for OS X 10.11+ --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ee6e8d7..f99c0f7 100644 --- a/README.md +++ b/README.md @@ -40,9 +40,9 @@ For `version`, you can use any git reference - a branch, a tag, a commit hash, e ### Known bugs -When you use `haxelib run hvm` some installations actually use Haxe to compile/run haxelib, then haxelib runs and calls `haxe/lib/hvm/0.0.2/run.n`. This is all well and good, until `hvm` tries to replace the Haxe binary, and the OS complains. A workaround is to use something along the lines of: +When you use `haxelib run hvm` some installations actually use Haxe to compile/run haxelib, then haxelib runs and calls `/usr/local/lib/haxelib/hvm/0,0,2/run.n`. This is all well and good, until `hvm` tries to replace the Haxe binary, and the OS complains. A workaround is to use something along the lines of: - sudo neko /usr/lib/haxe/lib/hvm/0,0,2/hvm.n --use development + sudo neko /usr/local/lib/haxelib/hvm/0,0,2/hvm.n --use development ### Implementation Details @@ -51,7 +51,7 @@ When you use `haxelib run hvm` some installations actually use Haxe to compile/r * When `--set` is used, the compiled version and the standard library are copied to your system path. You may need to use `sudo` for this to work. * On Linux & Mac: * You will need the build dependencies installed already. See - * This assumes you have your Haxe binary at `/usr/lib/haxe/haxe` and the standard library at `/usr/lib/haxe/std/`. It would be nice to make this configurable. + * This assumes you have your Haxe binary at `/usr/local/lib/haxe/haxe` and the standard library at `/usr/local/lib/haxe/std/`. It would be nice to make this configurable. * This will place your repo in `~/.hvm/`, where `~` is your home directory, found using the `HOME` environment variable. * On Windows: - * We are lacking an implementation, but it should be dead easy. See . Pull requests welcome. \ No newline at end of file + * We are lacking an implementation, but it should be dead easy. See . Pull requests welcome.