summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-11 02:52:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:20:04 -0500
commiteaa882b9a5eff41c3a8322ef8f57226f2ba13d52 (patch)
treed5d1aac2ea30332f3fe75b49a1ba192e877ed4cf
parent14fb42204b894f6c46a84f441e0bc1923f3ac9ac (diff)
downloadsamba-eaa882b9a5eff41c3a8322ef8f57226f2ba13d52.tar.gz
samba-eaa882b9a5eff41c3a8322ef8f57226f2ba13d52.tar.bz2
samba-eaa882b9a5eff41c3a8322ef8f57226f2ba13d52.zip
r8308: use the configured C compiler, instead of forcing gcc in external heimdal tool build
(This used to be commit 39c6cf91fb75dc5d7d14922f70b8be8dc15169e1)
-rwxr-xr-xsource4/heimdal_build/build_external.sh2
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal_build/build_external.sh b/source4/heimdal_build/build_external.sh
index c56e9b09bd..355facc6dd 100755
--- a/source4/heimdal_build/build_external.sh
+++ b/source4/heimdal_build/build_external.sh
@@ -3,6 +3,7 @@
# build generated asn1, et and flex files in heimdal/ tree
# tridge@samba.org, June 2005
+CC=shift
TOP=`pwd`
ASN1_COMPILE=$TOP/bin/asn1_compile
ET_COMPILE=$TOP/bin/compile_et
@@ -10,7 +11,6 @@ ET_COMPILE=$TOP/bin/compile_et
# we need to substitute these correctly based on configure output
FLEX=flex
BISON=bison
-CC=gcc
build_asn1() {
f=$1
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 45b82672e4..aca4589ffe 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -364,7 +364,7 @@ REQUIRED_SUBSYSTEMS = COMPILE_ET LIBREPLACE
#######################
# Start TARGET HEIMDAL_EXTERNAL
[TARGET::HEIMDAL_EXTERNAL]
-CMD = heimdal_build/build_external.sh
+CMD = heimdal_build/build_external.sh $(CC)
REQUIRED_SUBSYSTEMS = ASN1_COMPILER
# END TARGET HEIMDAL_EXTERNAL
#######################