8009196: install doesn't define $(AR) as /usr/ccs/bin/ar, results in ar: Command not found

Reviewed-by: tbell
This commit is contained in:
David Katleman 2013-02-28 19:30:43 -08:00
parent aaac35b3d7
commit 86b53b9dd7

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -74,24 +74,24 @@ ifeq ($(PLATFORM),macosx)
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif endif
ifndef CONFIGURE_BUILD # Utilities
# Utilities ifdef CROSS_COMPILE_ARCH
ifdef CROSS_COMPILE_ARCH AR = $(COMPILER_PATH)ar
AR = $(COMPILER_PATH)ar AS = $(COMPILER_PATH)as
AS = $(COMPILER_PATH)as LD = $(COMPILER_PATH)ld
LD = $(COMPILER_PATH)ld MCS = $(COMPILER_PATH)mcs
MCS = $(COMPILER_PATH)mcs NM = $(COMPILER_PATH)nm
NM = $(COMPILER_PATH)nm STRIP = $(COMPILER_PATH)strip
STRIP = $(COMPILER_PATH)strip endif
else
AR = $(UTILS_CCS_BIN_PATH)ar ifeq ($(PLATFORM),solaris)
AS = $(UTILS_CCS_BIN_PATH)as AR = $(UTILS_CCS_BIN_PATH)ar
LD = $(UTILS_CCS_BIN_PATH)ld AS = $(UTILS_CCS_BIN_PATH)as
MCS = $(UTILS_CCS_BIN_PATH)mcs LD = $(UTILS_CCS_BIN_PATH)ld
NM = $(UTILS_CCS_BIN_PATH)nm MCS = $(UTILS_CCS_BIN_PATH)mcs
STRIP = $(UTILS_CCS_BIN_PATH)strip NM = $(UTILS_CCS_BIN_PATH)nm
endif STRIP = $(UTILS_CCS_BIN_PATH)strip
endif # CONFIGURE_BUILD endif
ADB = $(UTILS_COMMAND_PATH)adb ADB = $(UTILS_COMMAND_PATH)adb
BASENAME = $(UTILS_COMMAND_PATH)basename BASENAME = $(UTILS_COMMAND_PATH)basename