From d814c6c16f1bff5acb07f0cb174e58e422a018b2 Mon Sep 17 00:00:00 2001 From: Ary Borenszweig Date: Fri, 12 Dec 2014 18:58:36 -0300 Subject: [PATCH] Removed `src` and crystal compiler `libs` directory from CRYSTAL_PATH. --- CHANGELOG.md | 5 +++++ Dockerfile | 2 +- Makefile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f60e95cab4..55df543277a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.5.5 (2014-12-12) + +* Removed `src` and crystal compiler `libs` directory from CRYSTAL_PATH. +* Several bug fixes. + ## 0.5.4 (2014-12-04) * **(breaking change)** `require "foo"` always looks up in `CRYSTAL_PATH`. `require "./foo"` looks up relative to the requiring file. diff --git a/Dockerfile b/Dockerfile index d092df7459f1..109f662580b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ADD . /opt/crystal-head WORKDIR /opt/crystal-head ENV CRYSTAL_CONFIG_VERSION head -ENV CRYSTAL_CONFIG_PATH src:libs:/opt/crystal-head/src:/opt/crystal-head/libs +ENV CRYSTAL_CONFIG_PATH libs:/opt/crystal-head/src:/opt/crystal-head/libs RUN PATH=$PATH:/opt/llvm-3.5.0-1/bin crystal build --release src/compiler/crystal.cr diff --git a/Makefile b/Makefile index 8e6aa6927c9f..761092f09d24 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ O := .build SOURCES := $(shell find src -name '*.cr') SPEC_SOURCES := $(shell find spec -name '*.cr') FLAGS := $(if $(release),--release )$(if $(stats),--stats )$(if $(threads),--threads $(threads) ) -EXPORTS := $(if $(release),,CRYSTAL_CONFIG_PATH=src:libs:`pwd`/src:`pwd`/libs) +EXPORTS := $(if $(release),,CRYSTAL_CONFIG_PATH=`pwd`/src) ifeq (Darwin,$(shell uname)) BUILD_PATH := PATH=`brew --prefix llvm`/bin:$$PATH LIBRARY_PATH=`brew --prefix crystal`/embedded/lib endif