Commit e3fc14c3a1a77a1cda669a3e16f1f6b82577e4ec

Authored by Jan Kiszka
Committed by Anthony Liguori
1 parent dca61621

configure: Append extra cflags and ldflags

In order to allow overriding flags that are set by configure, we have to
append them instead of prepending as it is done so far.

v2: Clarify documentation.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing 1 changed file with 6 additions and 6 deletions
configure
@@ -380,9 +380,9 @@ for opt do @@ -380,9 +380,9 @@ for opt do
380 ;; 380 ;;
381 --install=*) install="$optarg" 381 --install=*) install="$optarg"
382 ;; 382 ;;
383 - --extra-cflags=*) CFLAGS="$optarg" 383 + --extra-cflags=*) EXTRA_CFLAGS="$optarg"
384 ;; 384 ;;
385 - --extra-ldflags=*) LDFLAGS="$optarg" 385 + --extra-ldflags=*) EXTRA_LDFLAGS="$optarg"
386 ;; 386 ;;
387 --cpu=*) cpu="$optarg" 387 --cpu=*) cpu="$optarg"
388 ;; 388 ;;
@@ -601,8 +601,8 @@ echo &quot; --source-path=PATH path of source code [$source_path]&quot; @@ -601,8 +601,8 @@ echo &quot; --source-path=PATH path of source code [$source_path]&quot;
601 echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" 601 echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
602 echo " --cc=CC use C compiler CC [$cc]" 602 echo " --cc=CC use C compiler CC [$cc]"
603 echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc." 603 echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc."
604 -echo " --extra-cflags=CFLAGS add C compiler flags CFLAGS"  
605 -echo " --extra-ldflags=LDFLAGS add linker flags LDFLAGS" 604 +echo " --extra-cflags=CFLAGS append extra C compiler flags CFLAGS"
  605 +echo " --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS"
606 echo " --make=MAKE use specified make [$make]" 606 echo " --make=MAKE use specified make [$make]"
607 echo " --install=INSTALL use specified install [$install]" 607 echo " --install=INSTALL use specified install [$install]"
608 echo " --static enable static build [$static]" 608 echo " --static enable static build [$static]"
@@ -1490,8 +1490,8 @@ echo &quot;OS_CFLAGS=$OS_CFLAGS&quot; &gt;&gt; $config_mak @@ -1490,8 +1490,8 @@ echo &quot;OS_CFLAGS=$OS_CFLAGS&quot; &gt;&gt; $config_mak
1490 echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak 1490 echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak
1491 echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak 1491 echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
1492 echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak 1492 echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
1493 -echo "CFLAGS=$CFLAGS" >> $config_mak  
1494 -echo "LDFLAGS=$LDFLAGS" >> $config_mak 1493 +echo "CFLAGS=$CFLAGS $EXTRA_CFLAGS" >> $config_mak
  1494 +echo "LDFLAGS=$LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
1495 echo "EXESUF=$EXESUF" >> $config_mak 1495 echo "EXESUF=$EXESUF" >> $config_mak
1496 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak 1496 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
1497 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak 1497 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak