fix predefined flags not taken into account for non-default targets

Mon, 19 May 2025 13:17:31 +0200

author
Mike Becker <universe@uap-core.de>
date
Mon, 19 May 2025 13:17:31 +0200
changeset 141
76b93dbe3ea6
parent 140
f453503e09dc
child 142
ec5975c1b93e

fix predefined flags not taken into account for non-default targets

src/main/resources/make/configure.vm file | annotate | diff | comparison | revisions
test/configure file | annotate | diff | comparison | revisions
test/configure2 file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
--- 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
--- 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 "
--- 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 "
--- 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

mercurial