git.iko.soy/heroku-buildpack-stack
on master help sign in
Merge pull request #29 from tejon/master

Add vendor/lib and vendor/bin to relevant paths at runtime

commit940dc32083492d4b74aa5e946d36dcf61054675f authorMark Fine <mark.fine@gmail.com> dateWed 10 Jan 2018, 16:26 (9 years ago) parent4813e7ffcbe35f
1 file changed+4−4
compare with master
unifiedsplit
bin/compile+4−4
bin/compile+4−4
@@ -45,7 +45,7 @@ function set-default-env (){
4545}
4646
4747export LANG=en_US.UTF-8
48−export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:/usr/lib:$LIBRARY_PATH
48+export LIBRARY_PATH=$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib:$LIBRARY_PATH
4949export LD_LIBRARY_PATH=$LIBRARY_PATH
5050export PATH=$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:$PATH
5151export STACK_ROOT=$CACHE_DIR/.stack
@@ -104,9 +104,9 @@ else
104104fi
105105
106106# Set context environment variables.
107−set-env PATH "$WORK_DIR/.local/bin:\$PATH"
108−set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
109−set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:/usr/lib"
107+set-env PATH "$WORK_DIR/.local/bin:$WORK_DIR/vendor/bin:\$PATH"
108+set-default-env LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
109+set-default-env LD_LIBRARY_PATH "$WORK_DIR/vendor/ghc-libs:$WORK_DIR/vendor/lib:/usr/lib"
110110
111111speak "Making stack binaries available"
112112mkdir -p "$BUILD_DIR/vendor"