From edb63def754834c1e3654a8fd2681a7ec1f97a65 Mon Sep 17 00:00:00 2001 From: Slava Yurin Date: Thu, 20 Nov 2014 18:01:36 +0600 Subject: plugin/c_src: remove C_SRC_OPTS We can just LDFLAGS += and whatnot. --- README.md | 4 +--- erlang.mk | 5 ++--- plugins/c_src.mk | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 26ec407..4728008 100644 --- a/README.md +++ b/README.md @@ -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 ------------------ diff --git a/erlang.mk b/erlang.mk index e979093..5b07ef8 100644 --- a/erlang.mk +++ b/erlang.mk @@ -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) -- cgit v1.2.3