summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorRaimo Niskanen <raimo@erlang.org>2011-11-10 10:16:18 +0100
committerRaimo Niskanen <raimo@erlang.org>2011-11-15 11:57:39 +0100
commit15a0f41dd37c2147d2dd5da14eb3707fdeb22855 (patch)
treeb43f4c06ac42f05dd21bea630b91cd5f4a6d8ba7 /make
parentff305c1a15e34f1c8d4f923a8f0e532b4e946512 (diff)
downloaderlang-15a0f41dd37c2147d2dd5da14eb3707fdeb22855.tar.gz
Cleanup the use of TARGET in toplevel and common make and build files
Common file target.mk now passes the TARGET value through config.sub for canonification. Toplevel Makefile now calls target.mk so it handles TARGET like all sub-makefiles. Build script otp_build no longer creates a target specific directory that a long time ago was used for target specific configure cache file.
Diffstat (limited to 'make')
-rw-r--r--make/target.mk36
1 files changed, 36 insertions, 0 deletions
diff --git a/make/target.mk b/make/target.mk
index 06e895df90..a6493e09a5 100644
--- a/make/target.mk
+++ b/make/target.mk
@@ -1,3 +1,24 @@
+#
+# %CopyrightBegin%
+#
+# Copyright Ericsson AB 1998-2011. All Rights Reserved.
+#
+# The contents of this file are subject to the Erlang Public License,
+# Version 1.1, (the "License"); you may not use this file except in
+# compliance with the License. You should have received a copy of the
+# Erlang Public License along with this software. If not, it can be
+# retrieved online at http://www.erlang.org/.
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+# the License for the specific language governing rights and limitations
+# under the License.
+#
+# %CopyrightEnd%
+
+# Ensure that the make variable TARGET is set
+#
+
ifeq ($(OVERRIDE_TARGET),)
ifeq ($(TARGET),)
@@ -31,3 +52,18 @@ endif
endif
+ifneq ($(TARGET),)
+ifneq ($(TARGET),win32)
+ifneq ($(TARGET),vxworks)
+override TARGET := $(shell $(ERL_TOP)/erts/autoconf/config.sub $(TARGET))
+else
+endif
+else
+endif
+else
+endif
+
+ifeq ($(TARGET),)
+$(error Neither TARGET nor OVERRIDE_TARGET can be determined!)
+else
+endif