From: Alexandra Ellwood <lxs@mit.edu>
Date: Wed, 2 Jul 2003 18:04:35 +0000 (+0000)
Subject: KfM build should inherit CFLAGS and LDFLAGS from parent project
X-Git-Tag: krb5-1.4-beta1~828
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=11f2dea790f0d860eb7b49b733fa76f195ae966a;p=krb5.git

KfM build should inherit CFLAGS and LDFLAGS from parent project

ticket: 1642

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15662 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam b/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam
index 69432d0bd..b2957b39b 100644
--- a/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam
+++ b/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam
@@ -5,6 +5,19 @@ Sources = "$(SRCROOT)/../Sources" ;
 Reconf = "$(Sources)/util/reconf" ;
 Configure = "$(Sources)/configure" ;
 Makefile = "$(IntermediateBuild)/Makefile" ;
+MakeStamp = "$(IntermediateBuild)/make.stamp" ;
+
+if $(KerberosCFLAGS) != "" { 
+    KerberosCFLAGS = "CFLAGS=$(CFLAGS) -fno-common -include /usr/include/TargetConditionals.h" ; 
+} else {
+    KerberosCFLAGS = "CFLAGS=-fno-common -include /usr/include/TargetConditionals.h" ;
+}
+
+if $(KerberosLDFLAGS) != "" { 
+    KerberosLDFLAGS = "LDFLAGS=$(LDFLAGS) -Wl,-search_paths_first" ; 
+} else {
+    KerberosLDFLAGS = "LDFLAGS=-Wl,-search_paths_first" ;
+}
 
 #
 # Note: in this jam script we have separated the dependency tree from the 
@@ -32,7 +45,7 @@ rule Configure
 actions Configure
 {
     mkdir -p "$(1:D)"
-    cd "$(1:D)" && /bin/sh "$(2)" --prefix=/usr --localstatedir=/var/db CFLAGS="-fno-common -include /usr/include/TargetConditionals.h" LDFLAGS="-Wl,-search_paths_first" || rm -f "$(1)"
+    cd "$(1:D)" && /bin/sh "$(2)" --prefix=/usr --localstatedir=/var/db "$(KerberosCFLAGS)" "$(KerberosLDFLAGS)" || rm -f "$(1)"
 }
 
 # Make <stamp file> <build dir> : <makefile>