aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-11-01 17:45:13 +0100
committerLukas Larsson <[email protected]>2013-11-01 17:49:23 +0100
commit98232ea62b2a971c802ef38488eaab2a396fefef (patch)
treef2e092fec33b2fd7738fb4607782e7234daf4b40 /erts
parentf7659aeadf2b50acc6140c62a1d1587bf0a8795c (diff)
downloadotp-98232ea62b2a971c802ef38488eaab2a396fefef.tar.gz
otp-98232ea62b2a971c802ef38488eaab2a396fefef.tar.bz2
otp-98232ea62b2a971c802ef38488eaab2a396fefef.zip
erts: Move compiler flags generation
Move the call to utils/make_compiler_flags to after _create_dirs to make sure that the dirs are created before we try to generate files in there. This seems to work with parallel make as well, but I cannot find any documentation that says that it should or should not work.
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/Makefile.in16
1 files changed, 9 insertions, 7 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index f442540f49..68bb9c0bfb 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -387,13 +387,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:
@@ -472,6 +465,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 =