# HG changeset patch # User Mike Becker # Date 1747653451 -7200 # Node ID 76b93dbe3ea66f894444dde4b79db4d80754d622 # Parent f453503e09dc58f3a065c28421d149843e7962d2 fix predefined flags not taken into account for non-default targets diff -r f453503e09dc -r 76b93dbe3ea6 src/main/resources/make/configure.vm --- a/src/main/resources/make/configure.vm Mon May 19 13:11:23 2025 +0200 +++ b/src/main/resources/make/configure.vm Mon May 19 13:17:31 2025 +0200 @@ -567,9 +567,9 @@ echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" #end -TEMP_CFLAGS= -TEMP_CXXFLAGS= -TEMP_LDFLAGS= +TEMP_CFLAGS="$CFLAGS" +TEMP_CXXFLAGS="$CXXFLAGS" +TEMP_LDFLAGS="$LDFLAGS" #foreach( $dependency in $target.dependencies ) if dependency_error_$dependency; then diff -r f453503e09dc -r 76b93dbe3ea6 test/configure --- a/test/configure Mon May 19 13:11:23 2025 +0200 +++ b/test/configure Mon May 19 13:17:31 2025 +0200 @@ -573,9 +573,9 @@ echo >> "$TEMP_DIR/flags.mk" echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" -TEMP_CFLAGS= -TEMP_CXXFLAGS= -TEMP_LDFLAGS= +TEMP_CFLAGS="$CFLAGS" +TEMP_CXXFLAGS="$CXXFLAGS" +TEMP_LDFLAGS="$LDFLAGS" if dependency_error_libxml2; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " diff -r f453503e09dc -r 76b93dbe3ea6 test/configure2 --- a/test/configure2 Mon May 19 13:11:23 2025 +0200 +++ b/test/configure2 Mon May 19 13:17:31 2025 +0200 @@ -646,9 +646,9 @@ echo >> "$TEMP_DIR/flags.mk" echo "configuring target: dav" echo "# flags for target dav" >> "$TEMP_DIR/flags.mk" -TEMP_CFLAGS= -TEMP_CXXFLAGS= -TEMP_LDFLAGS= +TEMP_CFLAGS="$CFLAGS" +TEMP_CXXFLAGS="$CXXFLAGS" +TEMP_LDFLAGS="$LDFLAGS" if dependency_error_curl; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED curl " @@ -801,9 +801,9 @@ echo >> "$TEMP_DIR/flags.mk" echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" -TEMP_CFLAGS= -TEMP_CXXFLAGS= -TEMP_LDFLAGS= +TEMP_CFLAGS="$CFLAGS" +TEMP_CXXFLAGS="$CXXFLAGS" +TEMP_LDFLAGS="$LDFLAGS" if dependency_error_deptest; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED deptest " diff -r f453503e09dc -r 76b93dbe3ea6 test/make/configure.vm --- a/test/make/configure.vm Mon May 19 13:11:23 2025 +0200 +++ b/test/make/configure.vm Mon May 19 13:17:31 2025 +0200 @@ -567,9 +567,9 @@ echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" #end -TEMP_CFLAGS= -TEMP_CXXFLAGS= -TEMP_LDFLAGS= +TEMP_CFLAGS="$CFLAGS" +TEMP_CXXFLAGS="$CXXFLAGS" +TEMP_LDFLAGS="$LDFLAGS" #foreach( $dependency in $target.dependencies ) if dependency_error_$dependency; then