diff options
| author | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-01-02 16:50:58 +0000 |
|---|---|---|
| committer | pierre <pierre@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-01-02 16:50:58 +0000 |
| commit | 88ce5042dd143f698383b646a159001b023282d6 (patch) | |
| tree | 5115a70ae418352b02f0174585a7efa67c79692f /rtl/java | |
| parent | 3752ecc0b44baab7effa1a41206b2d70b67c610d (diff) | |
| download | fpc-88ce5042dd143f698383b646a159001b023282d6.tar.gz | |
Add explicit FPC_SYSTEM_OPT variable that is only used for compilation of system units, thus allowing to explicitly pass -Sf option
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@37890 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'rtl/java')
| -rw-r--r-- | rtl/java/Makefile | 4 | ||||
| -rw-r--r-- | rtl/java/Makefile.fpc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rtl/java/Makefile b/rtl/java/Makefile index 6b30e8d6a1..40964c3543 100644 --- a/rtl/java/Makefile +++ b/rtl/java/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-09-21 rev 37286] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-12-27 rev 37833] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux @@ -2321,7 +2321,7 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) + $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp $(REDIR) objpas$(PPUEXT) : objpas.pp diff --git a/rtl/java/Makefile.fpc b/rtl/java/Makefile.fpc index 9e4d1c4800..244135d9c4 100644 --- a/rtl/java/Makefile.fpc +++ b/rtl/java/Makefile.fpc @@ -81,7 +81,7 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) + $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) uuchar$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp $(COMPILER) $(INC)/uuchar.pp $(REDIR) |