Mercurial > hg > ucx / changeset

--- a/configure	Wed Dec 17 19:05:50 2025 +0100
+++ b/configure	Wed Dec 17 20:13:08 2025 +0100
@@ -535,7 +535,7 @@
     # dependency memrchr
     while true
     do
-        if $TOOLCHAIN_CC $CFLAGS -o /dev/null make/test_memrchr.c > /dev/null 2>&1 ; then
+        if $TOOLCHAIN_CC $CFLAGS $LDFLAGS -o /dev/null -D_GNU_SOURCE make/test_memrchr.c > /dev/null 2>&1 ; then
             :
         else
             break
@@ -546,20 +546,6 @@
         return 1
     done
 
-    # dependency memrchr
-    while true
-    do
-        if $TOOLCHAIN_CC $CFLAGS -o /dev/null -D_GNU_SOURCE make/test_memrchr.c > /dev/null 2>&1 ; then
-            :
-        else
-            break
-        fi
-        TEMP_CFLAGS="$TEMP_CFLAGS -DWITH_MEMRCHR -DMEMRCHR_NEED_GNU"
-        print_check_msg "$dep_checked_memrchr" "yes\n"
-        dep_checked_memrchr=1
-        return 1
-    done
-
     print_check_msg "$dep_checked_memrchr" "no\n"
     dep_checked_memrchr=1
     return 0

--- a/make/project.xml	Wed Dec 17 19:05:50 2025 +0100
+++ b/make/project.xml	Wed Dec 17 20:13:08 2025 +0100
@@ -99,15 +99,10 @@
     </dependency>
 
     <dependency name="memrchr">
-        <test>$TOOLCHAIN_CC $CFLAGS -o /dev/null make/test_memrchr.c</test>
+        <test>$TOOLCHAIN_CC $CFLAGS $LDFLAGS -o /dev/null -D_GNU_SOURCE make/test_memrchr.c</test>
         <cflags>-DWITH_MEMRCHR</cflags>
     </dependency>
 
-    <dependency name="memrchr">
-        <test>$TOOLCHAIN_CC $CFLAGS -o /dev/null -D_GNU_SOURCE make/test_memrchr.c</test>
-        <cflags>-DWITH_MEMRCHR -DMEMRCHR_NEED_GNU</cflags>
-    </dependency>
-
     <target>
         <feature name="api-docs">
             <dependencies>doxygen</dependencies>

--- a/src/string.c	Wed Dec 17 19:05:50 2025 +0100
+++ b/src/string.c	Wed Dec 17 20:13:08 2025 +0100
@@ -25,9 +25,9 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef MEMRCHR_NEED_GNU
+
+// for memrchr in glibc
 #define _GNU_SOURCE
-#endif
 
 #include "cx/string.h"