diff options
| author | Slava Yurin <[email protected]> | 2014-11-20 18:01:36 +0600 |
|---|---|---|
| committer | Slava Yurin <[email protected]> | 2014-11-22 11:05:18 +0600 |
| commit | edb63def754834c1e3654a8fd2681a7ec1f97a65 (patch) | |
| tree | 9977cd5d4f5cfaadab3e93d8ece1d90eac0d44a5 | |
| parent | 73e4844066c7e898aefbf4eb697eccb26440f45e (diff) | |
| download | erlang.mk-edb63def754834c1e3654a8fd2681a7ec1f97a65.tar.gz erlang.mk-edb63def754834c1e3654a8fd2681a7ec1f97a65.tar.bz2 erlang.mk-edb63def754834c1e3654a8fd2681a7ec1f97a65.zip | |
plugin/c_src: remove C_SRC_OPTS
We can just LDFLAGS += and whatnot.
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | erlang.mk | 5 | ||||
| -rw-r--r-- | plugins/c_src.mk | 5 |
3 files changed, 5 insertions, 9 deletions
@@ -278,9 +278,7 @@ You can override the temporary file containing information about Erlang's environment by setting the `C_SRC_ENV` variable. This file is automatically generated on first run. -Finally you can add extra compiler options using the -`C_SRC_OPTS` variable. You can also override the defaults -`CC` and `CFLAGS` if required. +You can also override the defaults `CC` and `CFLAGS` if required. Common_test plugin ------------------ @@ -585,7 +585,6 @@ list-templates: C_SRC_DIR = $(CURDIR)/c_src C_SRC_ENV ?= $(C_SRC_DIR)/env.mk -C_SRC_OPTS ?= C_SRC_OUTPUT ?= $(CURDIR)/priv/$(PROJECT).so # System type and C compiler/flags. @@ -636,8 +635,8 @@ else SOURCES := $(shell find $(C_SRC_DIR) -type f -regex ".*\.\(C\|cc?\|cpp\)") OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) -COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) $(C_SRC_OPTS) -c -COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(C_SRC_OPTS) -c +COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c +COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c app:: $(C_SRC_ENV) $(C_SRC_OUTPUT) diff --git a/plugins/c_src.mk b/plugins/c_src.mk index 1861c79..734f13a 100644 --- a/plugins/c_src.mk +++ b/plugins/c_src.mk @@ -8,7 +8,6 @@ C_SRC_DIR = $(CURDIR)/c_src C_SRC_ENV ?= $(C_SRC_DIR)/env.mk -C_SRC_OPTS ?= C_SRC_OUTPUT ?= $(CURDIR)/priv/$(PROJECT).so # System type and C compiler/flags. @@ -59,8 +58,8 @@ else SOURCES := $(shell find $(C_SRC_DIR) -type f -regex ".*\.\(C\|cc?\|cpp\)") OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) -COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) $(C_SRC_OPTS) -c -COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(C_SRC_OPTS) -c +COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c +COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c app:: $(C_SRC_ENV) $(C_SRC_OUTPUT) |