Changeset 3875f106 in mainline

Timestamp:

2018-11-09T13:36:27Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1a5fe4f

Parents:

9c75a99d

git-author:

Jiri Svoboda <jiri@…> (2018-10-09 06:34:48)

git-committer:

Jiri Svoboda <jiri@…> (2018-11-09 13:36:27)

Message:

Fix broken XCW. Allow using string.h by cross-platform SW even if _HELENOS_SOURCE needs to be defined.

Files:

• tools/xcw/bin/helenos-bld-config (modified) (1 diff)
• tools/xcw/bin/helenos-ld (added)
• tools/xcw/demo/Makefile (modified) (2 diffs)
• uspace/lib/c/include/string.h (modified) (1 diff)

tools/xcw/bin/helenos-bld-config

@@ -47 +47 @@
 case ".$1" in
 (.--cc) extract_field "CC" "$MAKEFILE_COMMON";;
+(.--ld) extract_field "LD" "$MAKEFILE_COMMON";;
 (.--uarch) extract_field "UARCH" "$MAKEFILE_CONFIG";;
 (.--endian)

tools/xcw/demo/Makefile

@@ -43 +43 @@
 
 CC = helenos-cc
-CFLAGS = -std=gnu99 -Wall `helenos-pkg-config --cflags libgui libdraw libmath`
+LD = helenos-ld
+CFLAGS = -std=gnu11 -Wall `helenos-pkg-config --cflags libgui libdraw libmath` \
+    -D_HELENOS_SOURCE
 LIBS = `helenos-pkg-config --libs libgui libdraw libmath`
 output = viewer
@@ -55 +57 @@
 
 $(output): $(objects)
-        $(CC) -o $@ $^ $(LIBS)
+        $(LD) -o $@ $^ $(LIBS)
 
 %.o: %.c

uspace/lib/c/include/string.h

@@ -36 +36 @@
 #define LIBC_STRING_H_
 
-#ifdef _HELENOS_SOURCE
+#if defined(_HELENOS_SOURCE) && !defined(_REALLY_WANT_STRING_H)
 #error Please use str.h and mem.h instead
 #endif