aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-07-18 15:14:29 +0200
committerRickard Green <[email protected]>2018-08-21 17:40:59 +0200
commitb3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e (patch)
tree8416d3b946a107acfaa92eeaaf5b0e5fd4949247 /make
parentd4b456742b8bdab6222008ffd20e3d086b646e3f (diff)
downloadotp-b3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e.tar.gz
otp-b3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e.tar.bz2
otp-b3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e.zip
Move configuration of crypto to crypto application from erts
In order to be able to handle runtime library path in crypto also DED parts was broken out into a macro.
Diffstat (limited to 'make')
-rw-r--r--make/configure.in8
-rw-r--r--make/otp_ded.mk.in25
2 files changed, 19 insertions, 14 deletions
diff --git a/make/configure.in b/make/configure.in
index c390e1ca31..987e02ddc1 100644
--- a/make/configure.in
+++ b/make/configure.in
@@ -93,6 +93,8 @@ dnl
if test "X$host" != "Xfree_source" -a "X$host" != "Xwin32"; then
AC_CANONICAL_HOST
+else
+ host_os=$host
fi
TARGET=$host
@@ -128,6 +130,8 @@ AC_PROG_CC
AC_PROG_CXX
AC_CHECK_TOOL(LD, [ld])
+LM_WINDOWS_ENVIRONMENT
+
_search_path=/bin:/usr/bin:/usr/local/bin:$PATH
AC_PATH_PROG(ENV, [env], false, $_search_path)
@@ -415,7 +419,9 @@ if test $CROSS_COMPILING = no; then
esac
fi
-AC_CONFIG_FILES([../Makefile output.mk])
+ERL_DED
+
+AC_CONFIG_FILES([../Makefile output.mk ../make/$host/otp_ded.mk:../make/otp_ded.mk.in])
AC_CONFIG_FILES([emd2exml], [chmod +x emd2exml])
AC_OUTPUT
diff --git a/make/otp_ded.mk.in b/make/otp_ded.mk.in
index 0b5311d75e..9c8df265de 100644
--- a/make/otp_ded.mk.in
+++ b/make/otp_ded.mk.in
@@ -24,27 +24,26 @@
# explicitly expressed here. Some applications need to
# be able to check this value *before* configure has
# been run and generated otp_ded.mk
-DED_MK_VSN = 1
+DED_MK_VSN = 2
# ----------------------------------------------------
# Variables needed for building Dynamic Erlang Drivers
# ----------------------------------------------------
-DED_CC = @CC@
-DED_GCC = @GCC@
+DED_CC = @DED_CC@
+DED_GCC = @DED_GCC@
DED_LD = @DED_LD@
DED_LDFLAGS = @DED_LDFLAGS@
-DED__NOWARN_NOTHR_CFLAGS = @DED_CFLAGS@
-DED__NOTHR_CFLAGS = @WFLAGS@ @DED_CFLAGS@
-DED__NOWARN_CFLAGS = @DED_EMU_THR_DEFS@ @DED_CFLAGS@
+DED_BASIC_CFLAGS = @DED_CFLAGS@
DED_THR_DEFS = @DED_THR_DEFS@
-DED_EMU_THR_DEFS = @DED_EMU_THR_DEFS@
-DED_WARN_FLAGS = @WFLAGS@
-DED_CFLAGS = @WERRORFLAGS@ @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_CFLAGS@
-DED_STATIC_CFLAGS = @WERRORFLAGS@ @WFLAGS@ @DED_EMU_THR_DEFS@ @DED_STATIC_CFLAGS@
-DED_LIBS = @LIBS@
+DED_WERRORFLAGS = @DED_WERRORFLAGS@
+DED_WARN_FLAGS = @DED_WARN_FLAGS@
+DED_CFLAGS = @DED_CFLAGS@
+DED_LD_FLAG_RUNTIME_LIBRARY_PATH = @DED_LD_FLAG_RUNTIME_LIBRARY_PATH@
+DED_STATIC_CFLAGS = @DED_STATIC_CFLAGS@
+DED_LIBS = @DED_LIBS@
DED_EXT = @DED_EXT@
-ERLANG_OSTYPE = @ERLANG_OSTYPE@
+DED_OSTYPE = @DED_OSTYPE@
PRIVDIR = ../priv
OBJDIR = $(PRIVDIR)/obj/$(TARGET)
LIBDIR = $(PRIVDIR)/lib/$(TARGET)
DED_SYS_INCLUDE = @DED_SYS_INCLUDE@
-DED_INCLUDES = $(DED_SYS_INCLUDE)
+DED_INCLUDES = @DED_INCLUDE@