瀏覽代碼

[make] use sed to rewrite _build/src to src

Simon Krajewski 7 年之前
父節點
當前提交
6b064066f4
共有 2 個文件被更改,包括 4 次插入1 次删除
  1. 1 0
      .gitignore
  2. 3 1
      Makefile

+ 1 - 0
.gitignore

@@ -109,3 +109,4 @@ tests/server/test/cases/
 tests/server/test.js
 
 tests/unit/pypy3-*
+tmp.tmp

+ 3 - 1
Makefile

@@ -45,6 +45,8 @@ FINDLIB_PACKAGES=$(FINDLIB_LIBS:%=-package %)
 CFLAGS=
 ALL_CFLAGS=-bin-annot -safe-string -thread -g -w -3 $(CFLAGS) $(ALL_INCLUDES) $(FINDLIB_PACKAGES)
 
+MESSAGE_FILTER=sed -e 's/_build\/src\//src\//' tmp.tmp
+
 ifeq ($(BYTECODE),1)
 	TARGET_FLAG = bytecode
 	COMPILER = ocamlfind ocamlc
@@ -59,7 +61,7 @@ else
 	OCAMLDEP_FLAGS = -native
 endif
 
-CC_CMD = $(COMPILER) $(ALL_CFLAGS) -c $<
+CC_CMD = ($(COMPILER) $(ALL_CFLAGS) -c $< 2>tmp.tmp && $(MESSAGE_FILTER)) || ($(MESSAGE_FILTER) && exit 1)
 
 # Meta information