diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2004-05-14 21:14:22 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2004-05-14 21:14:22 +0000 |
| commit | f47f267901f3f82eab007d0e974d5fa066142832 (patch) | |
| tree | ab7ec96f76f7428c84b535b55b1f585d7f049c31 /src/mac | |
| parent | 00d16863b52b743e539f3dba2831272a70afbe2f (diff) | |
| download | krb5-f47f267901f3f82eab007d0e974d5fa066142832.tar.gz krb5-f47f267901f3f82eab007d0e974d5fa066142832.tar.xz krb5-f47f267901f3f82eab007d0e974d5fa066142832.zip | |
Pass architecture environment to krb5 build system
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16336 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/mac')
| -rw-r--r-- | src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam b/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam index 77c8f79c12..24e8944e1c 100644 --- a/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam +++ b/src/mac/MacOSX/Scripts/Kerberos5ServerBuild.jam @@ -7,17 +7,18 @@ Configure = "$(Sources)/configure" ; Makefile = "$(IntermediateBuild)/Makefile" ; MakeStamp = "$(IntermediateBuild)/make.stamp" ; -if $(KerberosCFLAGS) != "" { - KerberosCFLAGS = "CFLAGS=$(CFLAGS) -fno-common -include /usr/include/TargetConditionals.h -DUSE_PASSWORD_SERVER" ; -} else { - KerberosCFLAGS = "CFLAGS=-fno-common -include /usr/include/TargetConditionals.h -DUSE_PASSWORD_SERVER" ; -} +# Assemble CFLAGS +CONFIGURE_CFLAGS = "-fno-common -include /usr/include/TargetConditionals.h -DUSE_PASSWORD_SERVER" ; +if $(RC_CFLAGS) != "" { CONFIGURE_CFLAGS = "$(CONFIGURE_CFLAGS) $(RC_CFLAGS)" ; } +if $(CFLAGS) != "" { CONFIGURE_CFLAGS = "$(CONFIGURE_CFLAGS) $(CFLAGS)" ; } +if $(OTHER_CFLAGS) != "" { CONFIGURE_CFLAGS = "$(CONFIGURE_CFLAGS) $(OTHER_CFLAGS)" ; } +if $(WARNING_CFLAGS) != "" { CONFIGURE_CFLAGS = "$(CONFIGURE_CFLAGS) $(WARNING_CFLAGS)" ; } +CONFIGURE_CFLAGS = "CFLAGS=$(CONFIGURE_CFLAGS)" ; -if $(KerberosLDFLAGS) != "" { - KerberosLDFLAGS = "LDFLAGS=$(LDFLAGS) -Wl,-search_paths_first" ; -} else { - KerberosLDFLAGS = "LDFLAGS=-Wl,-search_paths_first" ; -} +# Assemble LDFLAGS +CONFIGURE_LDFLAGS = "-Wl,-search_paths_first" ; +if $(LDFLAGS) != "" { CONFIGURE_LDFLAGS = "$(LDFLAGS) $(CONFIGURE_LDFLAGS)" ; } +CONFIGURE_LDFLAGS = "LDFLAGS=$(CONFIGURE_LDFLAGS:)" ; # # Note: in this jam script we have separated the dependency tree from the @@ -45,7 +46,7 @@ rule Configure actions Configure { mkdir -p "$(1:D)" - cd "$(1:D)" && /bin/sh "$(2)" --prefix=/usr --localstatedir=/var/db "$(KerberosCFLAGS)" "$(KerberosLDFLAGS)" || rm -f "$(1)" + cd "$(1:D)" && /bin/sh "$(2)" --prefix=/usr --localstatedir=/var/db "$(CONFIGURE_CFLAGS)" "$(CONFIGURE_LDFLAGS)" || rm -f "$(1)" } # Make <stamp file> : <makefile> |