diff options
| author | Rickard Green <[email protected]> | 2018-08-21 17:52:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-21 17:52:17 +0200 |
| commit | 1b9829f78970547659d73ed5d437f0b66d69c40f (patch) | |
| tree | 1c3f58009669f268ba92339a6c59ce46b4094c1a /make | |
| parent | 1b9aae1a5dd812933543615c3c25bd3321ec4061 (diff) | |
| parent | b3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e (diff) | |
| download | otp-1b9829f78970547659d73ed5d437f0b66d69c40f.tar.gz otp-1b9829f78970547659d73ed5d437f0b66d69c40f.tar.bz2 otp-1b9829f78970547659d73ed5d437f0b66d69c40f.zip | |
Merge branch 'rickard/crypto-configure/OTP-15129'
* rickard/crypto-configure/OTP-15129:
Move configuration of crypto to crypto application from erts
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.in | 8 | ||||
| -rw-r--r-- | make/otp_ded.mk.in | 25 |
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@ |