build: Do not over-write user-specified options.

ck_pring
Samy Al Bahra 14 years ago
parent 631d5f93f4
commit 8fd90d71c3

11
configure vendored

@ -214,6 +214,7 @@ case $PLATFORM in
"sun4u"|"sun4v"|"sparc64") "sun4u"|"sun4v"|"sparc64")
PLATFORM=sparcv9 PLATFORM=sparcv9
ENVIRONMENT=64 ENVIRONMENT=64
LDFLAGS="$LDFLAGS -m64"
;; ;;
i386|i486|i586|i686|i586_i686|pentium*|athlon*|k5|k6|k6_2|k6_3) i386|i486|i586|i686|i586_i686|pentium*|athlon*|k5|k6|k6_2|k6_3)
case $SYSTEM in case $SYSTEM in
@ -263,6 +264,7 @@ case $PLATFORM in
"amd64"|"x86_64") "amd64"|"x86_64")
PLATFORM=x86_64 PLATFORM=x86_64
ENVIRONMENT=64 ENVIRONMENT=64
LDFLAGS="$LDFLAGS -m64"
;; ;;
"i86pc") "i86pc")
ISA=`isainfo -n 2> /dev/null || echo i386` ISA=`isainfo -n 2> /dev/null || echo i386`
@ -292,7 +294,6 @@ assert "$PLATFORM" "$PLATFORM" "unsupported"
# Platform will be used as a macro. # Platform will be used as a macro.
PROFILE="${PROFILE:-$PLATFORM}" PROFILE="${PROFILE:-$PLATFORM}"
PLATFORM="__${PLATFORM}__" PLATFORM="__${PLATFORM}__"
LDFLAGS="-shared -fPIC"
printf "Finding suitable compiler........" printf "Finding suitable compiler........"
@ -347,13 +348,13 @@ fi
if test "$COMPILER" = "suncc"; then if test "$COMPILER" = "suncc"; then
LD=/bin/ld LD=/bin/ld
LDFLAGS="-G" LDFLAGS="$LDFLAGS -G"
CFLAGS="-xO5" CFLAGS="$CFLAGS -xO5"
PTHREAD_CFLAGS="-mt -lpthread" PTHREAD_CFLAGS="-mt -lpthread"
elif test "$COMPILER" = "gcc"; then elif test "$COMPILER" = "gcc"; then
LD=$CC LD=$CC
LDFLAGS="-shared -fPIC" LDFLAGS="$LDFLAGS -shared -fPIC"
CFLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses" CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -std=gnu99 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -fstrict-aliasing -O2 -pipe -Wno-parentheses"
PTHREAD_CFLAGS="-pthread" PTHREAD_CFLAGS="-pthread"
else else
assert "" "unknown compiler" assert "" "unknown compiler"

Loading…
Cancel
Save