Skip to content

Commit

Permalink
build: Add proper infrastructure for adding and checking host CPPFLAGS
Browse files Browse the repository at this point in the history
  • Loading branch information
DonDiego committed Feb 23, 2013
1 parent 2aac411 commit 4cc4b33
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ CFLAGS += $(ECFLAGS)
CCFLAGS = $(CPPFLAGS) $(CFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS)
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)

define COMPILE
Expand Down
17 changes: 16 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ Advanced options (experts only):
--ld=LD use linker LD
--host-cc=HOSTCC use host C compiler HOSTCC
--host-cflags=HCFLAGS use HCFLAGS when compiling for host
--host-cppflags=HCPPFLAGS use HCPPFLAGS when compiling for host
--host-ld=HOSTLD use host linker HOSTLD
--host-ldflags=HLDFLAGS use HLDFLAGS when linking for host
--host-libs=HLIBS use libs HLIBS when linking for host
Expand Down Expand Up @@ -648,6 +649,10 @@ add_extralibs(){
prepend extralibs $($ldflags_filter "$@")
}

add_host_cppflags(){
append host_cppflags "$@"
}

add_host_cflags(){
append host_cflags $($host_cflags_filter "$@")
}
Expand Down Expand Up @@ -962,6 +967,13 @@ check_host_cc(){
check_cmd $host_cc $host_cflags "$@" $HOSTCC_C $(hostcc_o $TMPO) $TMPC
}

check_host_cppflags(){
log check_host_cppflags "$@"
check_host_cc "$@" <<EOF && append host_cppflags "$@"
int x;
EOF
}

check_host_cflags(){
log check_host_cflags "$@"
set -- $($host_cflags_filter "$@")
Expand Down Expand Up @@ -1400,6 +1412,7 @@ CMDLINE_SET="

CMDLINE_APPEND="
extra_cflags
host_cppflags
"

# code dependency declarations
Expand Down Expand Up @@ -1889,7 +1902,8 @@ HOSTCC_C='-c'
HOSTCC_O='-o $@'
HOSTLD_O='-o $@'

host_cflags='-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600 -O3 -g'
host_cflags='-O3 -g'
host_cppflags='-D_ISOC99_SOURCE -D_XOPEN_SOURCE=600'
host_libs='-lm'
host_cflags_filter=echo
host_ldflags_filter=echo
Expand Down Expand Up @@ -3922,6 +3936,7 @@ AS_DEPFLAGS=$AS_DEPFLAGS
HOSTCC=$host_cc
HOSTLD=$host_ld
HOSTCFLAGS=$host_cflags
HOSTCPPFLAGS=$host_cppflags
HOSTEXESUF=$HOSTEXESUF
HOSTLDFLAGS=$host_ldflags
HOSTLIBS=$host_libs
Expand Down

0 comments on commit 4cc4b33

Please sign in to comment.