comparison: test/make/configure.vm
test/make/configure.vm
- changeset 77
- 439902ff0af3
- parent 76
- 620358ea3a0b
- child 78
- c3a62e0baa9e
equal
deleted
inserted
replaced
| 76:620358ea3a0b | 77:439902ff0af3 |
|---|---|
| 402 done | 402 done |
| 403 #end | 403 #end |
| 404 | 404 |
| 405 # add general dependency flags to flags.mk | 405 # add general dependency flags to flags.mk |
| 406 echo "# general flags" >> "$TEMP_DIR/flags.mk" | 406 echo "# general flags" >> "$TEMP_DIR/flags.mk" |
| 407 if [ -n "${TEMP_CFLAGS}" ]; then | 407 if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then |
| 408 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" | 408 echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
| 409 fi | 409 fi |
| 410 if [ -n "${TEMP_CXXFLAGS}" ]; then | 410 if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then |
| 411 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" | 411 echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
| 412 fi | 412 fi |
| 413 if [ -n "${TEMP_LDFLAGS}" ]; then | 413 if [ -n "${TEMP_LDFLAGS}" ]; then |
| 414 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" | 414 echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" |
| 415 fi | 415 fi |
| 532 #end | 532 #end |
| 533 fi | 533 fi |
| 534 fi | 534 fi |
| 535 #end | 535 #end |
| 536 | 536 |
| 537 if [ -n "${TEMP_CFLAGS}" ]; then | 537 if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then |
| 538 echo "${target.getCFlags()} += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" | 538 echo "${target.getCFlags()} += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk" |
| 539 fi | 539 fi |
| 540 if [ -n "${TEMP_CXXFLAGS}" ]; then | 540 if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then |
| 541 echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" | 541 echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk" |
| 542 fi | 542 fi |
| 543 if [ "$BUILD_TYPE" = "debug" ]; then | 543 if [ "$BUILD_TYPE" = "debug" ]; then |
| 544 echo '${target.getCFlags()} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" | 544 if [ -n "$lang_c" ]; then |
| 545 echo '${target.getCXXFlags()} += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk" | 545 echo '${target.getCFlags()} += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" |
| 546 fi | |
| 547 if [ -n "$lang_cpp" ]; then | |
| 548 echo '${target.getCXXFlags()} += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk" | |
| 549 fi | |
| 546 fi | 550 fi |
| 547 if [ "$BUILD_TYPE" = "release" ]; then | 551 if [ "$BUILD_TYPE" = "release" ]; then |
| 548 echo '${target.getCFlags()} += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" | 552 if [ -n "$lang_c" ]; then |
| 549 echo '${target.getCXXFlags()} += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk" | 553 echo '${target.getCFlags()} += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk" |
| 554 fi | |
| 555 if [ -n "$lang_cpp" ]; then | |
| 556 echo '${target.getCXXFlags()} += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk" | |
| 557 fi | |
| 550 fi | 558 fi |
| 551 if [ -n "${TEMP_LDFLAGS}" ]; then | 559 if [ -n "${TEMP_LDFLAGS}" ]; then |
| 552 echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" | 560 echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk" |
| 553 fi | 561 fi |
| 554 | 562 |
