7156914 openssl-fips fails to build if gcc-45 is installed
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Wed, 04 Apr 2012 10:40:48 -0700
changeset 758 8d61ac17827e
parent 757 a37ee009302a
child 759 5bd27f9a56b8
7156914 openssl-fips fails to build if gcc-45 is installed
components/openssl/openssl-fips/Makefile
components/openssl/openssl-fips/gcc/gcc
--- a/components/openssl/openssl-fips/Makefile	Tue Apr 03 13:30:32 2012 -0700
+++ b/components/openssl/openssl-fips/Makefile	Wed Apr 04 10:40:48 2012 -0700
@@ -55,8 +55,10 @@
 
 # Do not use $(PWD), it would not work if run from a different directory with
 # "gmake -C" as we do from openssl-0.9.8-fips-140.
-FIPS_PATH_32 = $(COMPONENT_DIR)/32:$(PATH)
-FIPS_PATH_64 = $(PATH)
+# we'll also pick up gcc if we find it in the path, so force it to
+# find one that doesn't work like it wants
+FIPS_PATH_32 = $(COMPONENT_DIR)/32:$(COMPONENT_DIR)/gcc:$(PATH)
+FIPS_PATH_64 = $(COMPONENT_DIR)/gcc:$(PATH)
 
 OPENSSL_FIPS_HMAC_KEY = etaonrishdlcupfm
 OPENSSL_FIPS_HMAC = 79193087e8115df76d3de1f346f7410df79cf6e0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openssl/openssl-fips/gcc/gcc	Wed Apr 04 10:40:48 2012 -0700
@@ -0,0 +1,6 @@
+#!/bin/ksh
+#
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+#
+# this is here to ensure we don't use gcc, by simply
+# being a script that exits with no output.