# HG changeset patch # User Mike Becker # Date 1747653879 -7200 # Node ID 90fcec3ae37ecded829ce0ad18c074dbbe3ba349 # Parent ec5975c1b93efeda0c9dba002ccc4e71f67f6aff revert previous "fix" regarding applying pre-defined flags to target flags (it was correct before) diff -r ec5975c1b93e -r 90fcec3ae37e src/main/resources/make/configure.vm --- a/src/main/resources/make/configure.vm Mon May 19 13:19:07 2025 +0200 +++ b/src/main/resources/make/configure.vm Mon May 19 13:24:39 2025 +0200 @@ -567,9 +567,9 @@ echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" #end -TEMP_CFLAGS="$CFLAGS" -TEMP_CXXFLAGS="$CXXFLAGS" -TEMP_LDFLAGS="$LDFLAGS" +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_LDFLAGS= #foreach( $dependency in $target.dependencies ) if dependency_error_$dependency; then diff -r ec5975c1b93e -r 90fcec3ae37e test/configure --- a/test/configure Mon May 19 13:19:07 2025 +0200 +++ b/test/configure Mon May 19 13:24:39 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="$CFLAGS" -TEMP_CXXFLAGS="$CXXFLAGS" -TEMP_LDFLAGS="$LDFLAGS" +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_LDFLAGS= if dependency_error_libxml2; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " diff -r ec5975c1b93e -r 90fcec3ae37e test/configure2 --- a/test/configure2 Mon May 19 13:19:07 2025 +0200 +++ b/test/configure2 Mon May 19 13:24:39 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="$CFLAGS" -TEMP_CXXFLAGS="$CXXFLAGS" -TEMP_LDFLAGS="$LDFLAGS" +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_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="$CFLAGS" -TEMP_CXXFLAGS="$CXXFLAGS" -TEMP_LDFLAGS="$LDFLAGS" +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_LDFLAGS= if dependency_error_deptest; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED deptest " diff -r ec5975c1b93e -r 90fcec3ae37e test/make/configure.vm --- a/test/make/configure.vm Mon May 19 13:19:07 2025 +0200 +++ b/test/make/configure.vm Mon May 19 13:24:39 2025 +0200 @@ -567,9 +567,9 @@ echo "configuring global target" echo "# flags for unnamed target" >> "$TEMP_DIR/flags.mk" #end -TEMP_CFLAGS="$CFLAGS" -TEMP_CXXFLAGS="$CXXFLAGS" -TEMP_LDFLAGS="$LDFLAGS" +TEMP_CFLAGS= +TEMP_CXXFLAGS= +TEMP_LDFLAGS= #foreach( $dependency in $target.dependencies ) if dependency_error_$dependency; then