diff options
| author | Lukas Larsson <[email protected]> | 2014-03-18 09:56:12 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-03-18 09:56:12 +0100 |
| commit | 57367a29ee6cdcba8ee05030fcfbf86c3bb77382 (patch) | |
| tree | 7dbf4c215ca3b514e1945268bc953534b496c13a /erts | |
| parent | 237264bc018b0cc17afeac5d3f6030073f314f9d (diff) | |
| parent | 4685ec726844b3b92d90c13bae0f4c96e86e3665 (diff) | |
| download | otp-57367a29ee6cdcba8ee05030fcfbf86c3bb77382.tar.gz otp-57367a29ee6cdcba8ee05030fcfbf86c3bb77382.tar.bz2 otp-57367a29ee6cdcba8ee05030fcfbf86c3bb77382.zip | |
Merge branch 'lukas/erts/make_deps_fixes/OTP-11784'
* lukas/erts/make_deps_fixes/OTP-11784:
erts: Fix resolve of generated files for depend
erts: Move compiler flags generation
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/Makefile.in | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 523130d01a..2a9a0a5c2f 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -414,13 +414,6 @@ else UNIX_ONLY_BUILDS = endif -ifeq ($(TARGET), win32) -TMPVAR := $(shell LANG=C $(PERL) utils/make_compiler_flags -o $(TTF_DIR)/erl_compile_flags.h -v CONFIG_H "N/A" -v CFLAGS "$(CFLAGS)" -v LDFLAGS "$(LDFLAGS)") -else -# We force this to be run every time this makefile is executed -TMPVAR := $(shell LANG=C $(PERL) utils/make_compiler_flags -o $(TTF_DIR)/erl_compile_flags.h -f CONFIG_H "$(ERL_TOP)/erts/$(TARGET)/config.h" -v CFLAGS "$(CFLAGS)" -v LDFLAGS "$(LDFLAGS)") -endif - .PHONY: all ifdef VOID_EMULATOR all: @@ -499,6 +492,15 @@ release_docs_spec: _create_dirs := $(shell mkdir -p $(CREATE_DIRS)) + +# has to be run after _create_dirs +ifeq ($(TARGET), win32) +TMPVAR := $(shell LANG=C $(PERL) utils/make_compiler_flags -o $(TTF_DIR)/erl_compile_flags.h -v CONFIG_H "N/A" -v CFLAGS "$(CFLAGS)" -v LDFLAGS "$(LDFLAGS)") +else +# We force this to be run every time this makefile is executed +TMPVAR := $(shell LANG=C $(PERL) utils/make_compiler_flags -o $(TTF_DIR)/erl_compile_flags.h -f CONFIG_H "$(ERL_TOP)/erts/$(TARGET)/config.h" -v CFLAGS "$(CFLAGS)" -v LDFLAGS "$(LDFLAGS)") +endif + GENERATE = HIPE_ASM = @@ -1087,7 +1089,9 @@ BEAM_SRC=$(wildcard beam/*.c) DRV_COMMON_SRC=$(wildcard drivers/common/*.c) DRV_OSTYPE_SRC=$(wildcard drivers/$(ERLANG_OSTYPE)/*.c) ALL_SYS_SRC=$(wildcard sys/$(ERLANG_OSTYPE)/*.c) $(wildcard sys/common/*.c) -TARGET_SRC=$(wildcard $(TARGET)/*.c) $(wildcard $(TTF_DIR)/*.c) +# We use $(shell ls) here instead of wildcard as $(wildcard ) resolved at +# loadtime of the makefile and at that time these files are not generated yet. +TARGET_SRC=$(shell ls $(TARGET)/*.c) $(shell ls $(TTF_DIR)/*.c) # I do not want the -MG flag on windows, it does not work properly for a # windows build. |