diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2021-10-26 10:03:26 +0300 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2021-10-26 18:05:35 +0300 |
commit | aa94a03cfb88d0b4e3d11a22eb6acb9c7b703e6d (patch) | |
tree | b4df3160848cc93205f7ecd4433dab76378d20da /NT_MAKEFILE | |
parent | 8aa15bc39b4b8729c419b03d845aeaba0e9a93a4 (diff) | |
download | bdwgc-aa94a03cfb88d0b4e3d11a22eb6acb9c7b703e6d.tar.gz |
Support CFLAGS_EXTRA for rare build scripts (NT/OS2/WCC_MAKEFILE)
* NT_MAKEFILE (CFLAGS_EXTRA): New variable (defined as empty).
* OS2_MAKEFILE (CFLAGS_EXTRA): Likewise.
* WCC_MAKEFILE (CFLAGS_EXTRA): Likewise.
* NT_MAKEFILE (.c.obj, .cpp.obj): Pass $(CFLAGS_EXTRA) to cc.
* OS2_MAKEFILE (CFLAGS): Append $(CFLAGS_EXTRA).
* WCC_MAKEFILE (CFLAGS, TEST_CFLAGS): Likewise.
Diffstat (limited to 'NT_MAKEFILE')
-rw-r--r-- | NT_MAKEFILE | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/NT_MAKEFILE b/NT_MAKEFILE index d725f925..070e3580 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -73,6 +73,9 @@ CORDFLAG=-MDd CFLAGS_MT=$(cvarsmt) -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK !ENDIF +# Extra user-defined flags to pass both to C and C++ compilers. +CFLAGS_EXTRA= + CFLAGS_SPECIFIC=$(CFLAGS_DEBUG) $(CFLAGS_GCDLL) $(CFLAGS_MT) CFLAGS_DEFAULT=-DALL_INTERIOR_POINTERS -DENABLE_DISCLAIM -DGC_ATOMIC_UNCOLLECTABLE -DGC_GCJ_SUPPORT -DJAVA_FINALIZATION -DNO_EXECUTE_PERMISSION -DUSE_MUNMAP @@ -106,12 +109,12 @@ check: gctest.exe test_cpp.exe cordtest.exe de.exe test_cpp.exe .c.obj: - $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) $(CORDFLAG) -Iinclude -I$(AO_INCLUDE_DIR) $(CFLAGS_DEFAULT) -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 + $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) $(CORDFLAG) -Iinclude -I$(AO_INCLUDE_DIR) $(CFLAGS_DEFAULT) -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS_EXTRA) $*.c /Fo$*.obj /wd4100 /wd4127 /wd4701 # Disable crt security warnings, since unfortunately they warn about all sorts # of safe uses of strncpy. It would be nice to leave the rest enabled. .cpp.obj: - $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude $(CFLAGS_DEFAULT) $(CXXFLAGS_SPECIFIC) -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj + $(cc) $(cdebug) $(cflags) $(CFLAGS_SPECIFIC) -Iinclude $(CFLAGS_DEFAULT) $(CXXFLAGS_SPECIFIC) -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS_EXTRA) $*.cpp /Fo$*.obj $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\gc_disclaim.h include\private\msvc_dbg.h |