comparison: test/make/configure.vm
test/make/configure.vm
- changeset 94
- 002497e6c27d
- parent 91
- f14d77dd4215
- child 97
- 1af1bfacd25a
equal
deleted
inserted
replaced
| 93:df47e083139b | 94:002497e6c27d |
|---|---|
| 442 done | 442 done |
| 443 #end | 443 #end |
| 444 | 444 |
| 445 # add general dependency flags to flags.mk | 445 # add general dependency flags to flags.mk |
| 446 echo "# general flags" >> "$TEMP_DIR/flags.mk" | 446 echo "# general flags" >> "$TEMP_DIR/flags.mk" |
| 447 if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then | 447 if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then |
| 448 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" | 448 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
| 449 fi | 449 fi |
| 450 if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then | 450 if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then |
| 451 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" | 451 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
| 452 fi | 452 fi |
| 453 if [ -n "${TEMP_LDFLAGS}" ]; then | 453 if [ -n "${TEMP_LDFLAGS}" ]; then |
| 454 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" | 454 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" |
| 455 fi | 455 fi |
| 576 #end | 576 #end |
| 577 fi | 577 fi |
| 578 fi | 578 fi |
| 579 #end | 579 #end |
| 580 | 580 |
| 581 if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then | 581 if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then |
| 582 echo "${target.cFlags} += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" | 582 echo "${target.cFlags} += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
| 583 fi | 583 fi |
| 584 if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then | 584 if [ -n "${TEMP_CXXFLAGS}" ] && [ -n "$lang_cpp" ]; then |
| 585 echo "${target.cxxFlags} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" | 585 echo "${target.cxxFlags} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
| 586 fi | 586 fi |
| 587 if [ "$BUILD_TYPE" = "debug" ]; then | 587 if [ "$BUILD_TYPE" = "debug" ]; then |
| 588 if [ -n "$lang_c" ]; then | 588 if [ -n "$lang_c" ]; then |
| 589 echo '${target.cFlags} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" | 589 echo '${target.cFlags} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" |
